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

Commit ca457204 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Here are two GPIO fixes for the v4.6 series, both in drivers:

   - Prevent NULL dereference in the Xgene driver
   - Fix an uninitialized spinlock in the menz127 driver"

* tag 'gpio-v4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: xgene: Prevent NULL pointer dereference
  gpio: menz127: Drop lock field from struct men_z127_gpio
parents c5bce408 8d8ee18c

drivers/gpio/gpio-menz127.c

+4 −5
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct men_z127_gpio { 
	void __iomem *reg_base;

	struct mcb_device *mdev;

	struct resource *mem;

	spinlock_t lock;

};



static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
@@ -69,7 +68,7 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio, 
		debounce /= 50;

	}



	spin_lock(&priv->lock);

	spin_lock(&gc->bgpio_lock);



	db_en = readl(priv->reg_base + MEN_Z127_DBER);
@@ -84,7 +83,7 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio, 
	writel(db_en, priv->reg_base + MEN_Z127_DBER);

	writel(db_cnt, priv->reg_base + GPIO_TO_DBCNT_REG(gpio));



	spin_unlock(&priv->lock);

	spin_unlock(&gc->bgpio_lock);



	return 0;

}
@@ -97,7 +96,7 @@ static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin) 
	if (gpio_pin >= gc->ngpio)

		return -EINVAL;



	spin_lock(&priv->lock);

	spin_lock(&gc->bgpio_lock);

	od_en = readl(priv->reg_base + MEN_Z127_ODER);



	if (gpiochip_line_is_open_drain(gc, gpio_pin))
@@ -106,7 +105,7 @@ static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin) 
		od_en &= ~BIT(gpio_pin);



	writel(od_en, priv->reg_base + MEN_Z127_ODER);

	spin_unlock(&priv->lock);

	spin_unlock(&gc->bgpio_lock);



	return 0;

}

drivers/gpio/gpio-xgene.c

+5 −0
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ static int xgene_gpio_probe(struct platform_device *pdev) 
	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		err = -EINVAL;

		goto err;

	}



	gpio->base = devm_ioremap_nocache(&pdev->dev, res->start,

							resource_size(res));

	if (!gpio->base) {