2 files changed, 9 insertions, 5 deletions

diff --git a/drivers/gpio/gpio-menz127.c b/drivers/gpio/gpio-menz127.c
index a68e199d579d..c5c9599a3a71 100644
--- a/drivers/gpio/gpio-menz127.c
+++ b/drivers/gpio/gpio-menz127.c
@@ -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;
 }
diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c
index c0aa387664bf..0dc916191689 100644
--- a/drivers/gpio/gpio-xgene.c
+++ b/drivers/gpio/gpio-xgene.c
@@ -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) {