Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linus

[~andy/linux] / drivers / video / s3c2410fb.c

diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 76a0e7fbd69297d96a755a111d53597a439fe24f..21a32adbb8ead4dde3e423f62108e2111be05533 100644 (file)
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -1005,7 +1005,6 @@ release_regs:
 release_mem:
        release_mem_region(res->start, size);
 dealloc_fb:
-       platform_set_drvdata(pdev, NULL);
        framebuffer_release(fbinfo);
        return ret;
 }
@@ -1051,7 +1050,6 @@ static int s3c2410fb_remove(struct platform_device *pdev)
 
        release_mem_region(info->mem->start, resource_size(info->mem));
 
-       platform_set_drvdata(pdev, NULL);
        framebuffer_release(fbinfo);
 
        return 0;