diff options
| author | Alexey Klimov <klimov.linux@gmail.com> | 2013-03-28 00:08:19 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-29 18:13:40 +0400 |
| commit | 30b29537bcba070b3df8d7d24c1975676a1a6a4f (patch) | |
| tree | a268c979c61a078fc2f07b4268b8ff0e8c407017 /drivers/media/radio/radio-ma901.c | |
| parent | 5b4617d82020addf244c8c5206270e49ef9933d6 (diff) | |
| download | linux-30b29537bcba070b3df8d7d24c1975676a1a6a4f.tar.xz | |
media: radio-ma901: return ENODEV in probe if usb_device doesn't match
Masterkit MA901 usb radio device shares USB ID with Atmel V-USB devices.
This patch adds additional checks in usb_ma901radio_probe() and if
product or manufacturer doesn't match we return -ENODEV and don't
continue. This allows hid drivers to handle not MA901 device.
Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/media/radio/radio-ma901.c')
| -rw-r--r-- | drivers/media/radio/radio-ma901.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-ma901.c b/drivers/media/radio/radio-ma901.c index c61f590029ad..348dafc0318a 100644 --- a/drivers/media/radio/radio-ma901.c +++ b/drivers/media/radio/radio-ma901.c @@ -347,9 +347,20 @@ static void usb_ma901radio_release(struct v4l2_device *v4l2_dev) static int usb_ma901radio_probe(struct usb_interface *intf, const struct usb_device_id *id) { + struct usb_device *dev = interface_to_usbdev(intf); struct ma901radio_device *radio; int retval = 0; + /* Masterkit MA901 usb radio has the same USB ID as many others + * Atmel V-USB devices. Let's make additional checks to be sure + * that this is our device. + */ + + if (dev->product && dev->manufacturer && + (strncmp(dev->product, "MA901", 5) != 0 + || strncmp(dev->manufacturer, "www.masterkit.ru", 16) != 0)) + return -ENODEV; + radio = kzalloc(sizeof(struct ma901radio_device), GFP_KERNEL); if (!radio) { dev_err(&intf->dev, "kzalloc for ma901radio_device failed\n"); |