lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 257/717] media: max9271: Fix GPIO enable/disable
    Date
    From: Jacopo Mondi <jacopo+renesas@jmondi.org>

    [ Upstream commit 909a0a189c677307edd461e21fd962784370d27f ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/i2c/max9271.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/i2c/max9271.c b/drivers/media/i2c/max9271.c
    index 0f6f7a092a463..c247db569bab0 100644
    --- a/drivers/media/i2c/max9271.c
    +++ b/drivers/media/i2c/max9271.c
    @@ -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);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:12    [W:5.239 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site