Linux-i2c Archive on lore.kernel.org
 help / color / Atom feed
From: Sergey Shtylyov <s.shtylyov@omprussia.ru>
To: <linux-i2c@vger.kernel.org>
Subject: [PATCH] i2c: sh7760: fix IRQ error path
Date: Sat, 17 Apr 2021 22:05:05 +0300
Message-ID: <5b81bf63-edc4-bb62-3aff-4ae9432e339b@omprussia.ru> (raw)
In-Reply-To: <7995bba1-61dd-baa3-51ea-0fb2fccc19a0@omprussia.ru>

While adding the invalid IRQ check after calling platform_get_irq(),
I managed to overlook that the driver has a complex error path in its
probe() method, thus a simple *return* couldn't be used.  Use a proper
*goto* instead!

Fixes: e5b2e3e74201 ("i2c: sh7760: add IRQ check")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>

---
This patch is against the '2c/for-next' branch of Wolfram's 'linux.git' repo.
I wasn't even able to complie-test it though...

 drivers/i2c/busses/i2c-sh7760.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux/drivers/i2c/busses/i2c-sh7760.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-sh7760.c
+++ linux/drivers/i2c/busses/i2c-sh7760.c
@@ -473,7 +473,7 @@ static int sh7760_i2c_probe(struct platf
 
 	ret = platform_get_irq(pdev, 0);
 	if (ret < 0)
-		return ret;
+		goto out3;
 	id->irq = ret;
 
 	id->adap.nr = pdev->id;

  parent reply index

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-10 20:11 [PATCH v2 0/6] Stop calling devm_request_irq() with invalid IRQs in the I2C bus drivers Sergey Shtylyov
2021-04-10 20:14 ` [PATCH v2 1/6] i2c: cadence: add IRQ check Sergey Shtylyov
2021-04-10 20:16 ` [PATCH v2 2/6] i2c: emev2: " Sergey Shtylyov
2021-04-10 20:18 ` [PATCH v2 3/6] i2c: jz4780: " Sergey Shtylyov
2021-04-10 20:20 ` [PATCH v2 4/6] i2c: mlxbf: " Sergey Shtylyov
2021-04-10 20:23 ` [PATCH v2 5/6] i2c: rcar: " Sergey Shtylyov
2021-04-10 20:25 ` [PATCH v2 6/6] i2c: sh7760: " Sergey Shtylyov
2021-04-15 15:52   ` Sergey Shtylyov
2021-04-15 19:57     ` Wolfram Sang
2021-04-10 20:31 ` [PATCH v2 0/6] Stop calling devm_request_irq() with invalid IRQs in the I2C bus drivers Sergey Shtylyov
2021-04-10 20:57 ` Sergey Shtylyov
2021-04-14  8:22 ` Wolfram Sang
2021-04-17 19:05 ` Sergey Shtylyov [this message]
2021-04-17 20:01   ` [PATCH] i2c: sh7760: fix IRQ error path Wolfram Sang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5b81bf63-edc4-bb62-3aff-4ae9432e339b@omprussia.ru \
    --to=s.shtylyov@omprussia.ru \
    --cc=linux-i2c@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-i2c Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-i2c/0 linux-i2c/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-i2c linux-i2c/ https://lore.kernel.org/linux-i2c \
		linux-i2c@vger.kernel.org
	public-inbox-index linux-i2c

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-i2c


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git