From: Shardar Shariff Md <smohammed-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
To: ldewangan-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org,
swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org,
thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
Cc: Shardar Shariff Md <smohammed-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH v6 1/4] i2c: tegra: disable clock before returning error
Date: Mon, 25 Apr 2016 17:27:35 +0530 [thread overview]
Message-ID: <1461585458-23948-1-git-send-email-smohammed@nvidia.com> (raw)
Disable clock before returning error in tegra_i2c_init()
Signed-off-by: Shardar Shariff Md <smohammed-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
Changes in v5:
- Move current patch as separate patch
Changes in v6:
- Remove unnecessary line
---
drivers/i2c/busses/i2c-tegra.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index d764d64..445398c3 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -483,19 +483,20 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
if (time_after(jiffies, timeout)) {
dev_warn(i2c_dev->dev,
"timeout waiting for config load\n");
- return -ETIMEDOUT;
+ err = -ETIMEDOUT;
+ goto err;
}
msleep(1);
}
}
- tegra_i2c_clock_disable(i2c_dev);
-
if (i2c_dev->irq_disabled) {
i2c_dev->irq_disabled = 0;
enable_irq(i2c_dev->irq);
}
+err:
+ tegra_i2c_clock_disable(i2c_dev);
return err;
}
--
1.8.1.5
WARNING: multiple messages have this Message-ID (diff)
From: Shardar Shariff Md <smohammed@nvidia.com>
To: <ldewangan@nvidia.com>, <wsa@the-dreams.de>,
<swarren@wwwdotorg.org>, <thierry.reding@gmail.com>,
<gnurou@gmail.com>, <linux-i2c@vger.kernel.org>,
<linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<jonathanh@nvidia.com>
Cc: Shardar Shariff Md <smohammed@nvidia.com>
Subject: [PATCH v6 1/4] i2c: tegra: disable clock before returning error
Date: Mon, 25 Apr 2016 17:27:35 +0530 [thread overview]
Message-ID: <1461585458-23948-1-git-send-email-smohammed@nvidia.com> (raw)
Disable clock before returning error in tegra_i2c_init()
Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
---
Changes in v5:
- Move current patch as separate patch
Changes in v6:
- Remove unnecessary line
---
drivers/i2c/busses/i2c-tegra.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index d764d64..445398c3 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -483,19 +483,20 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
if (time_after(jiffies, timeout)) {
dev_warn(i2c_dev->dev,
"timeout waiting for config load\n");
- return -ETIMEDOUT;
+ err = -ETIMEDOUT;
+ goto err;
}
msleep(1);
}
}
- tegra_i2c_clock_disable(i2c_dev);
-
if (i2c_dev->irq_disabled) {
i2c_dev->irq_disabled = 0;
enable_irq(i2c_dev->irq);
}
+err:
+ tegra_i2c_clock_disable(i2c_dev);
return err;
}
--
1.8.1.5
next reply other threads:[~2016-04-25 11:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-25 11:57 Shardar Shariff Md [this message]
2016-04-25 11:57 ` [PATCH v6 1/4] i2c: tegra: disable clock before returning error Shardar Shariff Md
2016-04-25 11:57 ` [PATCH v6 2/4] i2c: tegra: calculate timeout for config load when needed Shardar Shariff Md
2016-04-25 11:57 ` Shardar Shariff Md
2016-04-25 11:57 ` [PATCH v6 3/4] i2c: tegra: add separate function for config_load Shardar Shariff Md
2016-04-25 11:57 ` Shardar Shariff Md
2016-04-25 11:57 ` [PATCH v6 4/4] i2c: tegra: proper handling of error cases Shardar Shariff Md
2016-04-25 11:57 ` Shardar Shariff Md
[not found] ` <1461585458-23948-1-git-send-email-smohammed-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-04-25 12:35 ` [PATCH v6 1/4] i2c: tegra: disable clock before returning error Jon Hunter
2016-04-25 12:35 ` Jon Hunter
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=1461585458-23948-1-git-send-email-smohammed@nvidia.com \
--to=smohammed-ddmlm1+adcrqt0dzr+alfa@public.gmane.org \
--cc=gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=ldewangan-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.