diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 00:11:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 00:11:12 +0100 |
| commit | 10ee08b7570dde2bac77d3f96eca2ce630a32b49 (patch) | |
| tree | ae2aa24af89482d3a24343a121a53f6325c4d417 /drivers/input/misc | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| parent | Input: synaptics - fix touchpad not working after S2R on Vostro V13 (diff) | |
| download | linux-10ee08b7570dde2bac77d3f96eca2ce630a32b49.tar.xz linux-10ee08b7570dde2bac77d3f96eca2ce630a32b49.zip | |
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: synaptics - fix touchpad not working after S2R on Vostro V13
Input: cma3000_d0x - fix signedness bug in cma3000_thread_irq()
Input: wacom - add product id used by Samsung Slate 7
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/cma3000_d0x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c index 80793f1608eb..06517e60e50c 100644 --- a/drivers/input/misc/cma3000_d0x.c +++ b/drivers/input/misc/cma3000_d0x.c @@ -115,8 +115,8 @@ static void decode_mg(struct cma3000_accl_data *data, int *datax, static irqreturn_t cma3000_thread_irq(int irq, void *dev_id) { struct cma3000_accl_data *data = dev_id; - int datax, datay, dataz; - u8 ctrl, mode, range, intr_status; + int datax, datay, dataz, intr_status; + u8 ctrl, mode, range; intr_status = CMA3000_READ(data, CMA3000_INTSTATUS, "interrupt status"); if (intr_status < 0) |