HID: hid-pl: handle probe errors

oneukum · Sasha Levin · commit 1d46d07458db · 2026-03-04T07:20:59.000-05:00
[ Upstream commit 3756a27 ] Errors in init must be reported back or we'll follow a NULL pointer the first time FF is used. Fixes: 20eb127 ("hid: force feedback driver for PantherLord USB/PS2 2in1 Adapter") Cc: stable@vger.kernel.org Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Jiri Kosina <jkosina@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
@@ -194,9 +194,14 @@ static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id)
 		goto err;
 	}
 
-	plff_init(hdev);
+	ret = plff_init(hdev);
+	if (ret)
+		goto stop;
 
 	return 0;
+
+stop:
+	hid_hw_stop(hdev);
 err:
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,14 @@ static int pl_probe(struct hid_device hdev, const struct hid_device_id id)`
`194`	`194`	`goto err;`
`195`	`195`	`}`
`196`	`196`
`197`		`- plff_init(hdev);`
	`197`	`+ ret = plff_init(hdev);`
	`198`	`+ if (ret)`
	`199`	`+ goto stop;`
`198`	`200`
`199`	`201`	`return 0;`
	`202`	`+`
	`203`	`+stop:`
	`204`	`+ hid_hw_stop(hdev);`
`200`	`205`	`err:`
`201`	`206`	`return ret;`
`202`	`207`	`}`