diff options
Diffstat (limited to 'drivers/hid/hidraw.c')
| -rw-r--r-- | drivers/hid/hidraw.c | 12 | 
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index e263d473117..00ccf4b1985 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -285,8 +285,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,  				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) {  					int len; -					if (!hid->name) -						return 0; +					if (!hid->name) { +						ret = 0; +						break; +					}  					len = strlen(hid->name) + 1;  					if (len > _IOC_SIZE(cmd))  						len = _IOC_SIZE(cmd); @@ -297,8 +299,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,  				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) {  					int len; -					if (!hid->phys) -						return 0; +					if (!hid->phys) { +						ret = 0; +						break; +					}  					len = strlen(hid->phys) + 1;  					if (len > _IOC_SIZE(cmd))  						len = _IOC_SIZE(cmd);  |