On Tue, 31 Mar 2009, Dan Carpenter wrote:
> There were 2 places that returned directly instead of releasing their
> locks. I sent a fix for this file earlier but ended up missing these
> spots. I think what happened is that I have improved my checker script
> since then... Or maybe I just screwed up.
>
> regards,
> dan carpenter
>
> Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
>
> --- orig/drivers/hid/hidraw.c 2009-03-30 21:16:07.000000000 +0300
> +++ devel/drivers/hid/hidraw.c 2009-03-30 21:18:37.000000000 +0300
> @@ -274,8 +274,10 @@
>
> 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);
> @@ -286,8 +288,10 @@
>
> 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);
Applied, thanks Dan.
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
