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
This commit is contained in:
@@ -645,7 +645,7 @@ static int __devinit ad7879_probe(struct spi_device *spi)
|
||||
kfree(ts);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return error;
|
||||
}
|
||||
|
||||
static int __devexit ad7879_remove(struct spi_device *spi)
|
||||
@@ -732,7 +732,7 @@ static int __devinit ad7879_probe(struct i2c_client *client,
|
||||
kfree(ts);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return error;
|
||||
}
|
||||
|
||||
static int __devexit ad7879_remove(struct i2c_client *client)
|
||||
|
Reference in New Issue
Block a user