video: fbdev: atmel_lcdfb: fix return error code in atmel_lcdfb_of_init()

Yang Yingliang · Thomas Zimmermann · commit ba236455ee75 · 2020-11-17T08:47:15.000+01:00
If devm_kzalloc() failed after the first time, atmel_lcdfb_of_init() can't return -ENOMEM, fix this by putting the error code in loop. Fixes: b985172 ("video: atmel_lcdfb: add device tree suport") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20201117061350.3453742-1-yangyingliang@huawei.com
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
@@ -987,8 +987,8 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
 	}
 
 	INIT_LIST_HEAD(&pdata->pwr_gpios);
-	ret = -ENOMEM;
 	for (i = 0; i < gpiod_count(dev, "atmel,power-control"); i++) {
+		ret = -ENOMEM;
 		gpiod = devm_gpiod_get_index(dev, "atmel,power-control",
 					     i, GPIOD_ASIS);
 		if (IS_ERR(gpiod))

Original file line number	Diff line number	Diff line change
`@@ -987,8 +987,8 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)`
`987`	`987`	`}`
`988`	`988`
`989`	`989`	`INIT_LIST_HEAD(&pdata->pwr_gpios);`
`990`		`- ret = -ENOMEM;`
`991`	`990`	`for (i = 0; i < gpiod_count(dev, "atmel,power-control"); i++) {`
	`991`	`+ ret = -ENOMEM;`
`992`	`992`	`gpiod = devm_gpiod_get_index(dev, "atmel,power-control",`
`993`	`993`	`i, GPIOD_ASIS);`
`994`	`994`	`if (IS_ERR(gpiod))`