Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf3f2a2c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Linus Walleij
Browse files

gpio: generic: improve error handling in bgpio_map 



If bgpio_map returns NULL then err should always be set.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2db8aba8

drivers/gpio/gpio-generic.c

+5 −3
Original line number Diff line number Diff line
@@ -591,8 +591,10 @@ static void __iomem *bgpio_map(struct platform_device *pdev, 
	*err = 0;



	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);

	if (!r)

	if (!r) {

		*err = -EINVAL;

		return NULL;

	}



	sz = resource_size(r);

	if (sz != sane_sz) {
@@ -637,8 +639,8 @@ static int bgpio_pdev_probe(struct platform_device *pdev) 
	sz = resource_size(r);



	dat = bgpio_map(pdev, "dat", sz, &err);

	if (!dat)

		return err ? err : -EINVAL;

	if (err)

		return err;



	set = bgpio_map(pdev, "set", sz, &err);

	if (err)