Re: [PATCH] hid2hci: fix regression in /dev format after moving away from libusb

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Giovanni,

> The paths under /dev, in the default udev configuration, are formatted
> with two leading zeros, but the number obtained from sysfs don't have
> them, so we must convert them to integers and reformat them.
> 
> Signed-off-by: Giovanni Campagna <scampa.giovanni@xxxxxxxxx>

no signed-off for userspace patches. We only do that for kernel patches.

> ---
> tools/hid2hci.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/hid2hci.c b/tools/hid2hci.c
> index bb8a521..76d0b5a 100644
> --- a/tools/hid2hci.c
> +++ b/tools/hid2hci.c
> @@ -221,18 +221,21 @@ static int usb_switch_dell(int fd, enum mode mode)
> static int find_device(struct udev_device *udev_dev)
> {
> 	char path[PATH_MAX];
> -	const char *busnum, *devnum;
> +	const char *busnum_s, *devnum_s;

Use the suffix _str to make clear what it is.

> +	int busnum, devnum;
> 	int fd;
> 
> -	busnum = udev_device_get_sysattr_value(udev_dev, "busnum");
> -	if (!busnum)
> +	busnum_s = udev_device_get_sysattr_value(udev_dev, "busnum");
> +	if (!busnum_s)
> 		return -1;
> +	busnum = strtol(busnum_s, NULL, 10);
> 
> -	devnum = udev_device_get_sysattr_value(udev_dev, "devnum");
> -	if (!devnum)
> +	devnum_s = udev_device_get_sysattr_value(udev_dev, "devnum");
> +	if (!devnum_s)
> 		return -1;
> +	devnum = strtol(devnum_s, NULL, 10);
> 
> -	snprintf(path, sizeof(path), "/dev/bus/usb/%s/%s", busnum, devnum);
> +	snprintf(path, sizeof(path), "/dev/bus/usb/%03d/%03d", busnum, devnum);

Regards

Marcel

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux