aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/usbhid/hid-pidff.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c
index 484e3eec2f88..e565dbe91d97 100644
--- a/drivers/hid/usbhid/hid-pidff.c
+++ b/drivers/hid/usbhid/hid-pidff.c
@@ -1181,12 +1181,11 @@ static void pidff_reset(struct pidff_device *pidff)
1181 usbhid_wait_io(hid); 1181 usbhid_wait_io(hid);
1182 1182
1183 if (pidff->pool[PID_SIMULTANEOUS_MAX].value) { 1183 if (pidff->pool[PID_SIMULTANEOUS_MAX].value) {
1184 int sim_effects = pidff->pool[PID_SIMULTANEOUS_MAX].value[0]; 1184 while (pidff->pool[PID_SIMULTANEOUS_MAX].value[0] < 2) {
1185 while (sim_effects < 2) {
1186 if (i++ > 20) { 1185 if (i++ > 20) {
1187 printk(KERN_WARNING "hid-pidff: device reports " 1186 printk(KERN_WARNING "hid-pidff: device reports "
1188 "%d simultaneous effects\n", 1187 "%d simultaneous effects\n",
1189 sim_effects); 1188 pidff->pool[PID_SIMULTANEOUS_MAX].value[0]);
1190 break; 1189 break;
1191 } 1190 }
1192 debug("pid_pool requested again"); 1191 debug("pid_pool requested again");