pinctrl: mcp23s08: Fix missing unlock on error in mcp23s08_irq()

Zou Wei · gregkh · commit f190ca9068e3 · 2021-07-19T08:53:18.000+02:00
commit 884af72 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: 897120d ("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>
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ static irqreturn_t mcp23s08_irq(int irq, void *data)`
`461`	`461`
`462`	`462`	`if (intf == 0) {`
`463`	`463`	`/* There is no interrupt pending */`
`464`		`- return IRQ_HANDLED;`
	`464`	`+ goto unlock;`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`if (mcp_read(mcp, MCP_INTCAP, &intcap))`