diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 09:19:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 09:19:55 -0700 |
commit | 7eb1053fd00a8f0e2263697638e17da8a251aa74 (patch) | |
tree | dcb9a521c2866d1d0c7c62503696819ead76961b /drivers/input/touchscreen/ads7846.c | |
parent | 03a3f695cb9776cfa7da5e8e6d34fd20dd56510e (diff) | |
parent | 388bbcade41ee68d2d1ebb51a538380ea48ae599 (diff) | |
download | op-kernel-dev-7eb1053fd00a8f0e2263697638e17da8a251aa74.zip op-kernel-dev-7eb1053fd00a8f0e2263697638e17da8a251aa74.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: usbtouchscreen - support bigger iNexio touchscreens
Input: ads7846 - return error on regulator_get() failure
Input: twl4030-vibra - correct the power down sequence
Input: enable onkey driver of max8925
Input: use ABS_CNT rather than (ABS_MAX + 1)
Diffstat (limited to 'drivers/input/touchscreen/ads7846.c')
-rw-r--r-- | drivers/input/touchscreen/ads7846.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 532279c..634f6f6 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -1163,8 +1163,8 @@ static int __devinit ads7846_probe(struct spi_device *spi) ts->reg = regulator_get(&spi->dev, "vcc"); if (IS_ERR(ts->reg)) { - dev_err(&spi->dev, "unable to get regulator: %ld\n", - PTR_ERR(ts->reg)); + err = PTR_ERR(ts->reg); + dev_err(&spi->dev, "unable to get regulator: %ld\n", err); goto err_free_gpio; } |