tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2016-03-31 07:13:56 -05:00
parent c5bce408e4 8d8ee18cc7
commit ca4572042e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpio/gpio-menz127.c
+4 -5
View File
@@ -37,7 +37,6 @@ struct men_z127_gpio {
void __iomem *reg_base; void __iomem *reg_base;
struct mcb_device *mdev; struct mcb_device *mdev;
struct resource *mem; struct resource *mem;
spinlock_t lock;
}; };
static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio, 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; debounce /= 50;
} }
spin_lock(&priv->lock); spin_lock(&gc->bgpio_lock);
db_en = readl(priv->reg_base + MEN_Z127_DBER); 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_en, priv->reg_base + MEN_Z127_DBER);
writel(db_cnt, priv->reg_base + GPIO_TO_DBCNT_REG(gpio)); writel(db_cnt, priv->reg_base + GPIO_TO_DBCNT_REG(gpio));
spin_unlock(&priv->lock); spin_unlock(&gc->bgpio_lock);
return 0; return 0;
} }
@@ -97,7 +96,7 @@ static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin)
if (gpio_pin >= gc->ngpio) if (gpio_pin >= gc->ngpio)
return -EINVAL; return -EINVAL;
spin_lock(&priv->lock); spin_lock(&gc->bgpio_lock);
od_en = readl(priv->reg_base + MEN_Z127_ODER); od_en = readl(priv->reg_base + MEN_Z127_ODER);
if (gpiochip_line_is_open_drain(gc, gpio_pin)) 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); od_en &= ~BIT(gpio_pin);
writel(od_en, priv->reg_base + MEN_Z127_ODER); writel(od_en, priv->reg_base + MEN_Z127_ODER);
spin_unlock(&priv->lock); spin_unlock(&gc->bgpio_lock);
return 0; return 0;
} }
drivers/gpio/gpio-xgene.c
+5
View File
@@ -173,6 +173,11 @@ static int xgene_gpio_probe(struct platform_device *pdev)
} }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
err = -EINVAL;
goto err;
}
gpio->base = devm_ioremap_nocache(&pdev->dev, res->start, gpio->base = devm_ioremap_nocache(&pdev->dev, res->start,
resource_size(res)); resource_size(res));
if (!gpio->base) { if (!gpio->base) {