From: Shubhrajyoti D <shubhrajyoti@ti.com>
To: linux-omap@vger.kernel.org
Cc: tony@atomide.com, w.sang@pengutronix.de,
linux-i2c@vger.kernel.org, ben-linux@fluff.org,
Shubhrajyoti D <shubhrajyoti@ti.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCHv7 08/18] I2C: OMAP: Fix the error handling
Date: Wed, 11 Apr 2012 16:22:19 +0530 [thread overview]
Message-ID: <1334141549-8288-9-git-send-email-shubhrajyoti@ti.com> (raw)
In-Reply-To: <1334141549-8288-1-git-send-email-shubhrajyoti@ti.com>
Currently in probe
pm_runtime_put(dev->dev);
...
/* i2c device drivers may be active on return from add_adapter() */
adap->nr = pdev->id;
r = i2c_add_numbered_adapter(adap);
if (r) {
dev_err(dev->dev, "failure adding adapter\n");
goto err_free_irq;
}
...
return 0;
err_free_irq:
free_irq(dev->irq, dev);
err_unuse_clocks:
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
pm_runtime_put(dev->dev);
This may access the i2c registers without the clocks.
Attempting to fix the same by moving the pm_rintime_put after the error check.
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
---
drivers/i2c/busses/i2c-omap.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 2096726..a461097 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1095,8 +1095,6 @@ omap_i2c_probe(struct platform_device *pdev)
dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", pdev->id,
dev->dtrev, dev->rev >> 4, dev->rev & 0xf, dev->speed);
- pm_runtime_put(dev->dev);
-
adap = &dev->adapter;
i2c_set_adapdata(adap, dev);
adap->owner = THIS_MODULE;
@@ -1116,6 +1114,8 @@ omap_i2c_probe(struct platform_device *pdev)
of_i2c_register_devices(adap);
+ pm_runtime_put(dev->dev);
+
return 0;
err_free_irq:
--
1.7.4.1
next prev parent reply other threads:[~2012-04-11 10:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 10:52 [PATCHv7 00/18] I2C updates Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 01/18] I2C: OMAP: make omap_i2c_unidle/idle functions depend on CONFIG_PM_RUNTIME Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 04/18] I2C: OMAP: I2C register restore only if context is lost Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 05/18] I2C: OMAP: Fix the interrupt clearing in OMAP4 Shubhrajyoti D
[not found] ` <1334141549-8288-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2012-04-11 10:52 ` [PATCHv7 02/18] I2C: OMAP: Remove reset at init Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 03/18] I2C: OMAP: Recover from Bus Busy condition Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 06/18] I2C: OMAP: Fix the mismatch of pm_runtime enable and disable Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 11/18] I2C: OMAP: use devm_* functions Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 12/18] I2C: OMAP: Fix the crash in i2c remove Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 14/18] I2C: OMAP: Use SET_RUNTIME_PM_OPS Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 15/18] I2C: OMAP: make the read ready processing a separate function Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 17/18] I2C: OMAP: Do not set the XUDF if the underflow is not reached Shubhrajyoti D
2012-04-11 11:01 ` [PATCHv7 00/18] I2C updates Shubhrajyoti
2012-04-11 10:52 ` [PATCHv7 07/18] I2C: OMAP: Optimise the remove code Shubhrajyoti D
2012-04-11 10:52 ` Shubhrajyoti D [this message]
2012-04-11 10:52 ` [PATCHv7 09/18] I2C: OMAP: Correct I2C revision for OMAP3 Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 10/18] I2C: OMAP: Don't check if wait_for_completion_timeout() returns less than zero Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 13/18] I2C: OMAP: Handle error check for pm runtime Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 16/18] I2C: OMAP: fix missing handling of errata I2C_OMAP3_1P153 Shubhrajyoti D
2012-04-11 10:52 ` [PATCHv7 18/18] I2C: OMAP: Rename the 1p153 to the erratum id i462 Shubhrajyoti D
-- strict thread matches above, loose matches on Subject: below --
2012-04-11 11:12 [PATCHv7 00/18] I2C updates Shubhrajyoti D
2012-04-11 11:12 ` [PATCHv7 08/18] I2C: OMAP: Fix the error handling Shubhrajyoti D
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=1334141549-8288-9-git-send-email-shubhrajyoti@ti.com \
--to=shubhrajyoti@ti.com \
--cc=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
--cc=w.sang@pengutronix.de \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox