From: Wang Qing Date: Tue, 29 Mar 2022 09:14:32 +0000 (-0700) Subject: video: fbdev: pxafb: use if else instead X-Git-Tag: v5.18-rc5~35^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b23e868d35d572d459e9be4b994a8c709f1a1606;p=thirdparty%2Fkernel%2Flinux.git video: fbdev: pxafb: use if else instead use if and else instead of consequent if(A) and if (!A) Signed-off-by: Wang Qing Signed-off-by: Helge Deller --- diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c index f1551e00eb12f..8ad91c251fe6a 100644 --- a/drivers/video/fbdev/pxafb.c +++ b/drivers/video/fbdev/pxafb.c @@ -2256,10 +2256,10 @@ static int pxafb_probe(struct platform_device *dev) goto failed; for (i = 0; i < inf->num_modes; i++) inf->modes[i] = pdata->modes[i]; + } else { + inf = of_pxafb_of_mach_info(&dev->dev); } - if (!pdata) - inf = of_pxafb_of_mach_info(&dev->dev); if (IS_ERR_OR_NULL(inf)) goto failed;