]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
media: max9271: Fix GPIO enable/disable
authorJacopo Mondi <jacopo+renesas@jmondi.org>
Fri, 20 Nov 2020 16:15:28 +0000 (17:15 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 2 Dec 2020 15:14:27 +0000 (16:14 +0100)
Fix GPIO enable/disable operations which wrongly read the 0x0f register
to obtain the current mask of the enabled lines instead of using
the correct 0x0e register.

Also fix access to bit 0 of the register which is marked as reserved.

Fixes: 34009bffc1c6 ("media: i2c: Add RDACM20 driver")
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/i2c/max9271.c

index 0f6f7a092a463ab385d3d532cdf9b88942265be1..c247db569bab08a4e50cd5d2d1461c7b515c93c8 100644 (file)
@@ -223,12 +223,12 @@ int max9271_enable_gpios(struct max9271_device *dev, u8 gpio_mask)
 {
        int ret;
 
-       ret = max9271_read(dev, 0x0f);
+       ret = max9271_read(dev, 0x0e);
        if (ret < 0)
                return 0;
 
        /* BIT(0) reserved: GPO is always enabled. */
-       ret |= gpio_mask | BIT(0);
+       ret |= (gpio_mask & ~BIT(0));
        ret = max9271_write(dev, 0x0e, ret);
        if (ret < 0) {
                dev_err(&dev->client->dev, "Failed to enable gpio (%d)\n", ret);
@@ -245,12 +245,12 @@ int max9271_disable_gpios(struct max9271_device *dev, u8 gpio_mask)
 {
        int ret;
 
-       ret = max9271_read(dev, 0x0f);
+       ret = max9271_read(dev, 0x0e);
        if (ret < 0)
                return 0;
 
        /* BIT(0) reserved: GPO cannot be disabled */
-       ret &= (~gpio_mask | BIT(0));
+       ret &= ~(gpio_mask | BIT(0));
        ret = max9271_write(dev, 0x0e, ret);
        if (ret < 0) {
                dev_err(&dev->client->dev, "Failed to disable gpio (%d)\n", ret);