Commit a09ac40e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.6/hidraw' into for-linus 

- support for uniq ioctl()
parents 9e635c28 2f48865d

drivers/hid/hidraw.c

+9 −0
Original line number Diff line number Diff line
@@ -451,6 +451,15 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
						-EFAULT : len;

					break;

				}



				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWUNIQ(0))) {

					int len = strlen(hid->uniq) + 1;

					if (len > _IOC_SIZE(cmd))

						len = _IOC_SIZE(cmd);

					ret = copy_to_user(user_arg, hid->uniq, len) ?

						-EFAULT : len;

					break;

				}

			}



		ret = -ENOTTY;

include/uapi/linux/hidraw.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct hidraw_devinfo { 
/* The first byte of SFEATURE and GFEATURE is the report number */

#define HIDIOCSFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len)

#define HIDIOCGFEATURE(len)    _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len)

#define HIDIOCGRAWUNIQ(len)     _IOC(_IOC_READ, 'H', 0x08, len)



#define HIDRAW_FIRST_MINOR 0

#define HIDRAW_MAX_DEVICES 64