Merge remote-tracking branch 'arm-soc/for-next'

[karo-tx-linux.git] / drivers / video / cyber2000fb.c

diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 1c446bc48b42fdefca1861de934271840901e61c..b0a950f369703ff4ca002aabdecc55f638ea6189 100644 (file)
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1810,11 +1810,6 @@ static void cyberpro_pci_remove(struct pci_dev *dev)
                iounmap(cfb->region);
                cyberpro_free_fb_info(cfb);
 
-               /*
-                * Ensure that the driver data is no longer
-                * valid.
-                */
-               pci_set_drvdata(dev, NULL);
                if (cfb == int_cfb_info)
                        int_cfb_info = NULL;