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

2020-12-16 11:42:30 +01:00
parent 19a0b6d79c 9735d9deb1
commit 47cdd7f139
1 changed files with 2 additions and 4 deletions
@@ -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) {