Skip to content

Commit b3dce27

Browse files
Dan Carpenterhdeller
authored andcommitted
fbdev: omapfb: remove duplicate check in omapfb_setup_mem()
We know "size" is non-zero because it is checked on the line before. Delete the duplicate check and pull the code in a tab. Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent c292599 commit b3dce27

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

drivers/video/fbdev/omap/omapfb_main.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -846,12 +846,10 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
846846
* be reenabled unless its size is > 0.
847847
*/
848848
if (old_size != size && size) {
849-
if (size) {
850-
memcpy(new_var, &fbi->var, sizeof(*new_var));
851-
r = set_fb_var(fbi, new_var);
852-
if (r < 0)
853-
goto out;
854-
}
849+
memcpy(new_var, &fbi->var, sizeof(*new_var));
850+
r = set_fb_var(fbi, new_var);
851+
if (r < 0)
852+
goto out;
855853
}
856854

857855
if (fbdev->ctrl->sync)

0 commit comments

Comments
 (0)