Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[firefly-linux-kernel-4.4.55.git] / drivers / video / leo.c

diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index b17f5009a4363dab5546c57891c4d2564814737c..2c7f7d479fe2247b61e723ac60ed89fb3250ef55 100644 (file)
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -469,7 +469,7 @@ static void leo_wid_put(struct fb_info *info, struct fb_wid_list *wl)
 
                default:
                        continue;
-               };
+               }
                sbus_writel(0x5800 + j, &lx_krn->krn_type);
                sbus_writel(wi->wi_values[0], &lx_krn->krn_value);
        }
@@ -648,8 +648,6 @@ static int leo_remove(struct platform_device *op)
 
        framebuffer_release(info);
 
-       dev_set_drvdata(&op->dev, NULL);
-
        return 0;
 }