From ff2670c7982ac7e51564d9aec93d6dcbc12701d4 Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Sun, 11 Dec 2011 23:40:56 -0800 Subject: [PATCH] --- yaml --- r: 276830 b: refs/heads/master c: 3a7f8fb1d8c9b6a066b0452cea47c85547c97723 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/cma3000_d0x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86d96c7f75e8..28bd01d4046b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d0e3064a88cc8d6bd3a9b43c5ae069ca838fc6e +refs/heads/master: 3a7f8fb1d8c9b6a066b0452cea47c85547c97723 diff --git a/trunk/drivers/input/misc/cma3000_d0x.c b/trunk/drivers/input/misc/cma3000_d0x.c index 1633b6342267..09f8f2025580 100644 --- a/trunk/drivers/input/misc/cma3000_d0x.c +++ b/trunk/drivers/input/misc/cma3000_d0x.c @@ -114,8 +114,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)