summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2020-11-17 09:13:50 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 13:25:54 +0300
commit44ce61c8bda4b0c94e3536625aa1a54ee6d98f9a (patch)
tree07ee88fe8aa5fa92164a6deedd5ab4f5106306b6 /drivers/video
parent965209a3d0aa4e7c647db9fcaa6799529b285b1f (diff)
downloadlinux-44ce61c8bda4b0c94e3536625aa1a54ee6d98f9a.tar.xz
video: fbdev: atmel_lcdfb: fix return error code in atmel_lcdfb_of_init()
[ Upstream commit ba236455ee750270f33998df57f982433cea4d8e ] 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: b985172b328a ("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 Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/atmel_lcdfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 4ed55e6bbb84..6d01ae3984c7 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -1071,8 +1071,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))