summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2011-05-15 20:07:42 +0400
committerJiri Kosina <jkosina@suse.cz>2011-05-18 15:23:31 +0400
commitdd2ed487fdd78b50549b2ca8418875c0d9f4a30e (patch)
tree9bbd190e222eb02f7c39845b9e9e96c524fe39cd /drivers/hid
parent8c4e708d01424f88afde64a96ffd05146c9978b8 (diff)
downloadlinux-dd2ed487fdd78b50549b2ca8418875c0d9f4a30e.tar.xz
HID: 'name' and 'phys' in 'struct hid_device' can never be NULL
As they are static members of fix size, there is no need to NULL-check them. Signed-off-by: Daniel Mack <zonque@gmail.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hidraw.c14
-rw-r--r--drivers/hid/usbhid/hiddev.c18
2 files changed, 4 insertions, 28 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 93c72e593701..c79578b5a788 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -395,12 +395,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
}
if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) {
- int len;
- if (!hid->name) {
- ret = 0;
- break;
- }
- len = strlen(hid->name) + 1;
+ int len = strlen(hid->name) + 1;
if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd);
ret = copy_to_user(user_arg, hid->name, len) ?
@@ -409,12 +404,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
}
if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) {
- int len;
- if (!hid->phys) {
- ret = 0;
- break;
- }
- len = strlen(hid->phys) + 1;
+ int len = strlen(hid->phys) + 1;
if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd);
ret = copy_to_user(user_arg, hid->phys, len) ?
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 527003188bfe..2baa71e6cc29 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -801,14 +801,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
break;
if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) {
- int len;
-
- if (!hid->name) {
- r = 0;
- break;
- }
-
- len = strlen(hid->name) + 1;
+ int len = strlen(hid->name) + 1;
if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd);
r = copy_to_user(user_arg, hid->name, len) ?
@@ -817,14 +810,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) {
- int len;
-
- if (!hid->phys) {
- r = 0;
- break;
- }
-
- len = strlen(hid->phys) + 1;
+ int len = strlen(hid->phys) + 1;
if (len > _IOC_SIZE(cmd))
len = _IOC_SIZE(cmd);
r = copy_to_user(user_arg, hid->phys, len) ?