HID: pidff: effect can't be NULL

Jiri Kosina · Jiri Kosina · commit b9e9cd32ba33 · 2015-03-27T16:03:26.000+01:00
Force-beedback core guarantees that the 'effect' pointer that's being passed
to -&gt;upload() callback is non-NULL.

Reported-by: Dan Carpenter &lt;dan.carpenter@oracle.com&gt;
Signed-off-by: Jiri Kosina &lt;jkosina@suse.cz&gt;
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c
@@ -569,7 +569,7 @@ static int pidff_upload_effect(struct input_dev *dev, struct ff_effect *effect,
 	int error;
 
 	pidff->block_load[PID_EFFECT_BLOCK_INDEX].value[0] = 0;
-	if (old && effect) {
+	if (old) {
 		pidff->block_load[PID_EFFECT_BLOCK_INDEX].value[0] =
 			pidff->pid_id[effect->id];
 	}

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ static int pidff_upload_effect(struct input_dev dev, struct ff_effect effect,`
`569`	`569`	`int error;`
`570`	`570`
`571`	`571`	`pidff->block_load[PID_EFFECT_BLOCK_INDEX].value[0] = 0;`
`572`		`- if (old && effect) {`
	`572`	`+ if (old) {`
`573`	`573`	`pidff->block_load[PID_EFFECT_BLOCK_INDEX].value[0] =`
`574`	`574`	`pidff->pid_id[effect->id];`
`575`	`575`	`}`