Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / drivers / video / ep93xx-fb.c

diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index ee1ee54..28a837d 100644 (file)
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -595,7 +595,6 @@ failed_videomem:
        fb_dealloc_cmap(&info->cmap);
 failed_cmap:
        kfree(info);
-       platform_set_drvdata(pdev, NULL);
 
        return err;
 }
@@ -614,7 +613,6 @@ static int ep93xxfb_remove(struct platform_device *pdev)
                fbi->mach_info->teardown(pdev);
 
        kfree(info);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }