diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 16:32:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 16:32:24 -0400 |
| commit | baf4974e496957681403d4bf74a3274ed3f85277 (patch) | |
| tree | 7c255a3e8a27f21ccc40a9886d40673c945a8073 /drivers/input/touchscreen | |
| parent | 79a6f564401f1d47989e706d47053a650f296966 (diff) | |
| parent | d3d2dfe2d723051cac323017af5d0180ba8de4c1 (diff) | |
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: i8042 - print debug data when testing AUX IRQ delivery
Input: libps2 - fix dependancy on i8042
Input: fix rx51 board keymap
Input: ad7879 - pass up error codes from probe functions
Input: xpad - add BigBen Interactive XBOX 360 Controller
Input: rotary_encoder - fix relative axis support
Input: sparkspkr - move remove() functions to .devexit.text
Input: wistron_btns - add DMI entry for Medion WIM2030 laptop
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 f06332c9e21b..c21e6d3a8844 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) |