Merge branch 'for-5.11/intel-ish' into for-linus

47cdd7f1 · Jiri Kosina · 19a0b6d7 · 9735d9de · 47cdd7f1
Commit 47cdd7f1 authored Dec 16, 2020 by Jiri Kosina
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

drivers/hid/intel-ish-hid/ishtp-hid.c drivers/hid/intel-ish-hid/ishtp-hid.c +2 -4

No files found.
--- a/drivers/hid/intel-ish-hid/ishtp-hid.c
+++ b/drivers/hid/intel-ish-hid/ishtp-hid.c
@@ -211,10 +211,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
 	struct ishtp_hid_data *hid_data;

 	hid = hid_allocate_device();
-	if (IS_ERR(hid)) {
-		rv = PTR_ERR(hid);
-		return	-ENOMEM;
-	}
+	if (IS_ERR(hid))
+		return PTR_ERR(hid);

 	hid_data = kzalloc(sizeof(*hid_data), GFP_KERNEL);
 	if (!hid_data) {