media: streamzap: no need for usb pid/vid in device name

[ Upstream commit 7a25e6849ad73de5aa01d62da43071bc02b8530c ]

The usb pid/vid can be found elsewhere, the idVendor/idProduct usb sysfs
files for example.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: f656cfbc7a29 ("media: streamzap: fix race between device disconnection and urb callback")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index cd4bb605a76146957ff995daac4c4bf3ee984bcd..b6391ad38314313de0f40503d2ff001c75d105b0 100644 (file)
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -88,7 +88,6 @@ struct streamzap_ir {
        ktime_t                 signal_start;
        bool                    timeout_enabled;
 
-       char                    name[128];
        char                    phys[64];
 };
 
@@ -287,13 +286,10 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz)
                goto out;
        }
 
-       snprintf(sz->name, sizeof(sz->name), "Streamzap PC Remote Infrared Receiver (%04x:%04x)",
-                le16_to_cpu(sz->usbdev->descriptor.idVendor),
-                le16_to_cpu(sz->usbdev->descriptor.idProduct));
        usb_make_path(sz->usbdev, sz->phys, sizeof(sz->phys));
        strlcat(sz->phys, "/input0", sizeof(sz->phys));
 
-       rdev->device_name = sz->name;
+       rdev->device_name = "Streamzap PC Remote Infrared Receiver";
        rdev->input_phys = sz->phys;
        usb_to_input_id(sz->usbdev, &rdev->input_id);
        rdev->dev.parent = dev;