From: Marek Vasut <marek.vasut@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: dmitry.torokhov@gmail.com, vapier@gentoo.org, pavel@ucw.cz,
akpm@linux-foundation.org, khilman@deeprootsystems.com,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
eric.y.miao@gmail.com, Marek Vasut <marek.vasut@gmail.com>
Subject: [PATCH v2] Input: Make ADS7846 independent on regulator
Date: Sat, 31 Jul 2010 09:09:42 +0200 [thread overview]
Message-ID: <1280560182-7071-1-git-send-email-marek.vasut@gmail.com> (raw)
In case regulator was not found, ADS7846 failed to probe.
This fixes a problem on some Sharp Zaurus devices, where there is no regulator
present and the touchscreen is used.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
drivers/input/touchscreen/ads7846.c | 38 +++++++++++++++++++---------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index a9fdf55..53b318b 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -791,7 +791,8 @@ static void ads7846_disable(struct ads7846 *ts)
}
}
- regulator_disable(ts->reg);
+ if (ts->reg)
+ regulator_disable(ts->reg);
/* we know the chip's in lowpower mode since we always
* leave it that way after every request
@@ -804,7 +805,8 @@ static void ads7846_enable(struct ads7846 *ts)
if (!ts->disabled)
return;
- regulator_enable(ts->reg);
+ if (ts->reg)
+ regulator_enable(ts->reg);
ts->disabled = 0;
ts->irq_disabled = 0;
@@ -1162,16 +1164,15 @@ static int __devinit ads7846_probe(struct spi_device *spi)
ts->last_msg = m;
ts->reg = regulator_get(&spi->dev, "vcc");
- if (IS_ERR(ts->reg)) {
- err = PTR_ERR(ts->reg);
- dev_err(&spi->dev, "unable to get regulator: %d\n", err);
- goto err_free_gpio;
- }
-
- err = regulator_enable(ts->reg);
- if (err) {
- dev_err(&spi->dev, "unable to enable regulator: %d\n", err);
- goto err_put_regulator;
+ if (IS_ERR(ts->reg))
+ ts->reg = NULL;
+ else {
+ err = regulator_enable(ts->reg);
+ if (err) {
+ dev_err(&spi->dev, "unable to enable regulator: %d\n",
+ err);
+ goto err_put_regulator;
+ }
}
if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING,
@@ -1218,10 +1219,11 @@ static int __devinit ads7846_probe(struct spi_device *spi)
err_free_irq:
free_irq(spi->irq, ts);
err_disable_regulator:
- regulator_disable(ts->reg);
+ if (ts->reg)
+ regulator_disable(ts->reg);
err_put_regulator:
- regulator_put(ts->reg);
- err_free_gpio:
+ if (ts->reg)
+ regulator_put(ts->reg);
if (ts->gpio_pendown != -1)
gpio_free(ts->gpio_pendown);
err_cleanup_filter:
@@ -1251,8 +1253,10 @@ static int __devexit ads7846_remove(struct spi_device *spi)
/* suspend left the IRQ disabled */
enable_irq(ts->spi->irq);
- regulator_disable(ts->reg);
- regulator_put(ts->reg);
+ if (ts->reg) {
+ regulator_disable(ts->reg);
+ regulator_put(ts->reg);
+ }
if (ts->gpio_pendown != -1)
gpio_free(ts->gpio_pendown);
--
1.7.1
next reply other threads:[~2010-07-31 7:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-31 7:09 Marek Vasut [this message]
2010-09-07 12:23 ` [PATCH v2] Input: Make ADS7846 independent on regulator Igor Grinberg
2010-09-07 12:53 ` Mark Brown
2010-09-09 8:27 ` Marek Vasut
2010-09-09 9:41 ` Mark Brown
2010-10-01 0:20 ` Marek Vasut
2010-10-05 6:49 ` Igor Grinberg
2010-10-05 8:21 ` Marek Vasut
2010-10-05 16:16 ` Dmitry Torokhov
2010-10-05 16:40 ` Mark Brown
2010-10-05 18:07 ` Dmitry Torokhov
2010-10-05 18:59 ` Mark Brown
2010-10-05 19:35 ` Alan Cox
2010-10-05 20:42 ` Mark Brown
2010-10-05 22:09 ` Linus Walleij
2010-10-05 22:52 ` Mark Brown
2010-10-06 8:01 ` Linus Walleij
2010-10-06 15:14 ` Mark Brown
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=1280560182-7071-1-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=dmitry.torokhov@gmail.com \
--cc=eric.y.miao@gmail.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=vapier@gentoo.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).