]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pinctrl: mcp23s08: Fix missing unlock on error in mcp23s08_irq()
authorZou Wei <zou_wei@huawei.com>
Tue, 8 Jun 2021 06:34:08 +0000 (14:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jul 2021 06:53:18 +0000 (08:53 +0200)
commit 884af72c90016cfccd5717439c86b48702cbf184 upstream.

Add the missing unlock before return from function mcp23s08_irq()
in the error handling case.

v1-->v2:
   remove the "return IRQ_HANDLED" line

Fixes: 897120d41e7a ("pinctrl: mcp23s08: fix race condition in irq handler")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zou Wei <zou_wei@huawei.com>
Link: https://lore.kernel.org/r/1623134048-56051-1-git-send-email-zou_wei@huawei.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pinctrl/pinctrl-mcp23s08.c

index 9d5e2d9b6b932c54bb80e1c538bb9117a8b1a4f9..70fe9476d0cf1a86edb134d07b75f157e2def04f 100644 (file)
@@ -461,7 +461,7 @@ static irqreturn_t mcp23s08_irq(int irq, void *data)
 
        if (intf == 0) {
                /* There is no interrupt pending */
-               return IRQ_HANDLED;
+               goto unlock;
        }
 
        if (mcp_read(mcp, MCP_INTCAP, &intcap))