aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/mouse/appletouch.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-31 21:02:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-31 21:02:39 -0400
commit09d692e6ff50e455f936e7e114e11f6ec5e0ea33 (patch)
treef6693dac827dd2afced8285e59bce73d7e04c636 /drivers/input/mouse/appletouch.c
parentce9d8d9f7214c7b74a5dd7be8221545269a31155 (diff)
parentd745b5326dd1960bf1d9ce2cb8408561a81a7271 (diff)
downloadlinux-2.6.38-lt-ux500-09d692e6ff50e455f936e7e114e11f6ec5e0ea33.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: appletouch - remove extra KERN_DEBUG use from dprintk Input: bu21013_ts - fix null dereference in error handling Input: ad7879 - prevent invalid finger data reports
Diffstat (limited to 'drivers/input/mouse/appletouch.c')
-rw-r--r--drivers/input/mouse/appletouch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index a9cf7683163..b77f9991278 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -630,7 +630,7 @@ static void atp_complete_geyser_3_4(struct urb *urb)
/* Just update the base values (i.e. touchpad in untouched state) */
if (dev->data[dev->info->datalen - 1] & ATP_STATUS_BASE_UPDATE) {
- dprintk(KERN_DEBUG "appletouch: updated base values\n");
+ dprintk("appletouch: updated base values\n");
memcpy(dev->xy_old, dev->xy_cur, sizeof(dev->xy_old));
goto exit;