diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index b7aa68b3eeffe65c5c3919d903211eac76ab403d..0f6c61491f741e23448ac7d6ec9db4a973bccda7 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -594,8 +594,6 @@ static int clcdfb_remove(struct amba_device *dev)
 {
 	struct clcd_fb *fb = amba_get_drvdata(dev);
 
-	amba_set_drvdata(dev, NULL);
-
 	clcdfb_disable(fb);
 	unregister_framebuffer(&fb->fb);
 	if (fb->fb.cmap.len)