Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / drivers / video / fbdev / uvesafb.c

diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index 509d452..d32d1c4 100644 (file)
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -1219,8 +1219,7 @@ static int uvesafb_release(struct fb_info *info, int user)
        uvesafb_vbe_state_restore(par, par->vbe_state_orig);
 out:
        atomic_dec(&par->ref_count);
-       if (task)
-               uvesafb_free(task);
+       uvesafb_free(task);
        return 0;
 }
 
@@ -1923,8 +1922,7 @@ static int uvesafb_init(void)
                        err = -ENOMEM;
 
                if (err) {
-                       if (uvesafb_device)
-                               platform_device_put(uvesafb_device);
+                       platform_device_put(uvesafb_device);
                        platform_driver_unregister(&uvesafb_driver);
                        cn_del_callback(&uvesafb_cn_id);
                        return err;