diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2009-10-06 00:43:43 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-10-06 01:00:21 -0400 |
commit | 4fa5757a4c54fe59c4d7d7a68ac2d0a5493a2bef (patch) | |
tree | 0060ecd75bf00e375c007f98595d96a6b983b74f /drivers/input/touchscreen | |
parent | 3ac91d36bb8fdfe9b73a3169e6b42cda0518e56a (diff) |
Input: ad7879 - pass up error codes from probe functions
If the sub-probe functions fail, we need to pass up the error code to the
higher levels from the probe function. We currently always return 0 even
if there was an error so higher levels don't report problems.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/ad7879.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c index 806464177e02..b965101074ec 100644 --- a/drivers/input/touchscreen/ad7879.c +++ b/drivers/input/touchscreen/ad7879.c | |||
@@ -645,7 +645,7 @@ static int __devinit ad7879_probe(struct spi_device *spi) | |||
645 | kfree(ts); | 645 | kfree(ts); |
646 | } | 646 | } |
647 | 647 | ||
648 | return 0; | 648 | return error; |
649 | } | 649 | } |
650 | 650 | ||
651 | static int __devexit ad7879_remove(struct spi_device *spi) | 651 | static int __devexit ad7879_remove(struct spi_device *spi) |
@@ -732,7 +732,7 @@ static int __devinit ad7879_probe(struct i2c_client *client, | |||
732 | kfree(ts); | 732 | kfree(ts); |
733 | } | 733 | } |
734 | 734 | ||
735 | return 0; | 735 | return error; |
736 | } | 736 | } |
737 | 737 | ||
738 | static int __devexit ad7879_remove(struct i2c_client *client) | 738 | static int __devexit ad7879_remove(struct i2c_client *client) |