Commit 590ade88 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.13/core' into for-linus 

- hiddev_connect() return value fix from Jason Gerecke
parents 276559d8 9951bb25

drivers/hid/usbhid/hiddev.c

+3 −3
Original line number Diff line number Diff line
@@ -887,11 +887,11 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) 
				break;



		if (i == hid->maxcollection)

			return -1;

			return -EINVAL;

	}



	if (!(hiddev = kzalloc(sizeof(struct hiddev), GFP_KERNEL)))

		return -1;

		return -ENOMEM;



	init_waitqueue_head(&hiddev->wait);

	INIT_LIST_HEAD(&hiddev->list);
@@ -905,7 +905,7 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) 
		hid_err(hid, "Not able to get a minor for this device\n");

		hid->hiddev = NULL;

		kfree(hiddev);

		return -1;

		return retval;

	}



	/*