aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2011-05-15 12:07:42 -0400
committerJiri Kosina <jkosina@suse.cz>2011-05-18 07:23:31 -0400
commitdd2ed487fdd78b50549b2ca8418875c0d9f4a30e (patch)
tree9bbd190e222eb02f7c39845b9e9e96c524fe39cd /drivers/hid/usbhid
parent8c4e708d01424f88afde64a96ffd05146c9978b8 (diff)
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/usbhid')
-rw-r--r--drivers/hid/usbhid/hiddev.c18
1 files changed, 2 insertions, 16 deletions
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)
801 break; 801 break;
802 802
803 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) { 803 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) {
804 int len; 804 int len = strlen(hid->name) + 1;
805
806 if (!hid->name) {
807 r = 0;
808 break;
809 }
810
811 len = strlen(hid->name) + 1;
812 if (len > _IOC_SIZE(cmd)) 805 if (len > _IOC_SIZE(cmd))
813 len = _IOC_SIZE(cmd); 806 len = _IOC_SIZE(cmd);
814 r = copy_to_user(user_arg, hid->name, len) ? 807 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)
817 } 810 }
818 811
819 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) { 812 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) {
820 int len; 813 int len = strlen(hid->phys) + 1;
821
822 if (!hid->phys) {
823 r = 0;
824 break;
825 }
826
827 len = strlen(hid->phys) + 1;
828 if (len > _IOC_SIZE(cmd)) 814 if (len > _IOC_SIZE(cmd))
829 len = _IOC_SIZE(cmd); 815 len = _IOC_SIZE(cmd);
830 r = copy_to_user(user_arg, hid->phys, len) ? 816 r = copy_to_user(user_arg, hid->phys, len) ?