lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: bcm5974 - silence uninitialized variables warnings

Browse Source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Henrik Rydberg
2009-09-13 09:10:11 -07:00
committed by Dmitry Torokhov
parent 85927b0d52
commit 9de48cc300
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/input/mouse/bcm5974.c
View File

@@ -317,7 +317,7 @@ static int report_tp_state(struct bcm5974 *dev, int size)
const struct tp_finger *f; const struct tp_finger *f;
struct input_dev *input = dev->input; struct input_dev *input = dev->input;
int raw_p, raw_w, raw_x, raw_y, raw_n; int raw_p, raw_w, raw_x, raw_y, raw_n;
int ptest = 0, origin = 0, ibt = 0, nmin = 0, nmax = 0; int ptest, origin, ibt = 0, nmin = 0, nmax = 0;
int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0; int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;
if (size < c->tp_offset || (size - c->tp_offset) % SIZEOF_FINGER != 0) if (size < c->tp_offset || (size - c->tp_offset) % SIZEOF_FINGER != 0)
@@ -345,21 +345,22 @@ static int report_tp_state(struct bcm5974 *dev, int size)
/* set the integrated button if applicable */ /* set the integrated button if applicable */
if (c->tp_type == TYPE2) if (c->tp_type == TYPE2)
ibt = raw2int(dev->tp_data[BUTTON_TYPE2]); ibt = raw2int(dev->tp_data[BUTTON_TYPE2]);
}
/* while tracking finger still valid, count all fingers */ /* while tracking finger still valid, count all fingers */
if (ptest > PRESSURE_LOW && origin) { if (ptest > PRESSURE_LOW && origin) {
abs_p = ptest; abs_p = ptest;
abs_w = int2bound(&c->w, raw_w); abs_w = int2bound(&c->w, raw_w);
abs_x = int2bound(&c->x, raw_x - c->x.devmin); abs_x = int2bound(&c->x, raw_x - c->x.devmin);
abs_y = int2bound(&c->y, c->y.devmax - raw_y); abs_y = int2bound(&c->y, c->y.devmax - raw_y);
while (raw_n--) { while (raw_n--) {
ptest = int2bound(&c->p, raw2int(f->force_major)); ptest = int2bound(&c->p,
if (ptest > PRESSURE_LOW) raw2int(f->force_major));
nmax++; if (ptest > PRESSURE_LOW)
if (ptest > PRESSURE_HIGH) nmax++;
nmin++; if (ptest > PRESSURE_HIGH)
f++; nmin++;
f++;
}
} }
} }