Loading drivers/media/rc/streamzap.c +1 −19 Original line number Diff line number Diff line Loading @@ -26,7 +26,6 @@ #include <linux/usb/input.h> #include <media/rc-core.h> #define DRIVER_VERSION "1.61" #define DRIVER_NAME "streamzap" #define DRIVER_DESC "Streamzap Remote Control driver" Loading Loading @@ -271,10 +270,8 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz) int ret; rdev = rc_allocate_device(RC_DRIVER_IR_RAW); if (!rdev) { dev_err(dev, "remote dev allocation failed\n"); if (!rdev) goto out; } usb_make_path(sz->usbdev, sz->phys, sizeof(sz->phys)); strlcat(sz->phys, "/input0", sizeof(sz->phys)); Loading Loading @@ -315,7 +312,6 @@ static int streamzap_probe(struct usb_interface *intf, struct usb_device *usbdev = interface_to_usbdev(intf); struct usb_host_interface *iface_host; struct streamzap_ir *sz = NULL; char buf[63], name[128] = ""; int retval = -ENOMEM; int pipe, maxp; Loading Loading @@ -374,17 +370,6 @@ static int streamzap_probe(struct usb_interface *intf, sz->dev = &intf->dev; sz->buf_in_len = maxp; if (usbdev->descriptor.iManufacturer && usb_string(usbdev, usbdev->descriptor.iManufacturer, buf, sizeof(buf)) > 0) strscpy(name, buf, sizeof(name)); if (usbdev->descriptor.iProduct && usb_string(usbdev, usbdev->descriptor.iProduct, buf, sizeof(buf)) > 0) snprintf(name + strlen(name), sizeof(name) - strlen(name), " %s", buf); sz->rdev = streamzap_init_rc_dev(sz); if (!sz->rdev) goto rc_dev_fail; Loading Loading @@ -415,9 +400,6 @@ static int streamzap_probe(struct usb_interface *intf, if (usb_submit_urb(sz->urb_in, GFP_ATOMIC)) dev_err(sz->dev, "urb submit failed\n"); dev_info(sz->dev, "Registered %s on usb%d:%d\n", name, usbdev->bus->busnum, usbdev->devnum); return 0; rc_dev_fail: Loading Loading
drivers/media/rc/streamzap.c +1 −19 Original line number Diff line number Diff line Loading @@ -26,7 +26,6 @@ #include <linux/usb/input.h> #include <media/rc-core.h> #define DRIVER_VERSION "1.61" #define DRIVER_NAME "streamzap" #define DRIVER_DESC "Streamzap Remote Control driver" Loading Loading @@ -271,10 +270,8 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz) int ret; rdev = rc_allocate_device(RC_DRIVER_IR_RAW); if (!rdev) { dev_err(dev, "remote dev allocation failed\n"); if (!rdev) goto out; } usb_make_path(sz->usbdev, sz->phys, sizeof(sz->phys)); strlcat(sz->phys, "/input0", sizeof(sz->phys)); Loading Loading @@ -315,7 +312,6 @@ static int streamzap_probe(struct usb_interface *intf, struct usb_device *usbdev = interface_to_usbdev(intf); struct usb_host_interface *iface_host; struct streamzap_ir *sz = NULL; char buf[63], name[128] = ""; int retval = -ENOMEM; int pipe, maxp; Loading Loading @@ -374,17 +370,6 @@ static int streamzap_probe(struct usb_interface *intf, sz->dev = &intf->dev; sz->buf_in_len = maxp; if (usbdev->descriptor.iManufacturer && usb_string(usbdev, usbdev->descriptor.iManufacturer, buf, sizeof(buf)) > 0) strscpy(name, buf, sizeof(name)); if (usbdev->descriptor.iProduct && usb_string(usbdev, usbdev->descriptor.iProduct, buf, sizeof(buf)) > 0) snprintf(name + strlen(name), sizeof(name) - strlen(name), " %s", buf); sz->rdev = streamzap_init_rc_dev(sz); if (!sz->rdev) goto rc_dev_fail; Loading Loading @@ -415,9 +400,6 @@ static int streamzap_probe(struct usb_interface *intf, if (usb_submit_urb(sz->urb_in, GFP_ATOMIC)) dev_err(sz->dev, "urb submit failed\n"); dev_info(sz->dev, "Registered %s on usb%d:%d\n", name, usbdev->bus->busnum, usbdev->devnum); return 0; rc_dev_fail: Loading