diff options
author | Alexey Klimov <klimov.linux@gmail.com> | 2009-01-25 18:05:58 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:27 -0400 |
commit | c7181cfa6b8fa54ea4f3361e111afb60b095297a (patch) | |
tree | 3aad836618af54959228e0463a828f02b5df46b8 /drivers/media/radio | |
parent | d0852ed27c650237800470b5cbde368316813406 (diff) |
V4L/DVB (10316): v4l/dvb: use usb_make_path in usb-radio drivers
Place usb_make_path in dsbr100.c, radio-mr800.c, radio-si470x.c that
used when reporting bus_info information in vidioc_querycap.
Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r-- | drivers/media/radio/dsbr100.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/radio-mr800.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index 2014ebc4e984..09988f020c48 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c | |||
@@ -390,9 +390,11 @@ static void usb_dsbr100_disconnect(struct usb_interface *intf) | |||
390 | static int vidioc_querycap(struct file *file, void *priv, | 390 | static int vidioc_querycap(struct file *file, void *priv, |
391 | struct v4l2_capability *v) | 391 | struct v4l2_capability *v) |
392 | { | 392 | { |
393 | struct dsbr100_device *radio = video_drvdata(file); | ||
394 | |||
393 | strlcpy(v->driver, "dsbr100", sizeof(v->driver)); | 395 | strlcpy(v->driver, "dsbr100", sizeof(v->driver)); |
394 | strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card)); | 396 | strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card)); |
395 | sprintf(v->bus_info, "USB"); | 397 | usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); |
396 | v->version = RADIO_VERSION; | 398 | v->version = RADIO_VERSION; |
397 | v->capabilities = V4L2_CAP_TUNER; | 399 | v->capabilities = V4L2_CAP_TUNER; |
398 | return 0; | 400 | return 0; |
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index fdfc7bf86b9e..624e98b575cf 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
@@ -313,9 +313,11 @@ static void usb_amradio_disconnect(struct usb_interface *intf) | |||
313 | static int vidioc_querycap(struct file *file, void *priv, | 313 | static int vidioc_querycap(struct file *file, void *priv, |
314 | struct v4l2_capability *v) | 314 | struct v4l2_capability *v) |
315 | { | 315 | { |
316 | struct amradio_device *radio = video_drvdata(file); | ||
317 | |||
316 | strlcpy(v->driver, "radio-mr800", sizeof(v->driver)); | 318 | strlcpy(v->driver, "radio-mr800", sizeof(v->driver)); |
317 | strlcpy(v->card, "AverMedia MR 800 USB FM Radio", sizeof(v->card)); | 319 | strlcpy(v->card, "AverMedia MR 800 USB FM Radio", sizeof(v->card)); |
318 | sprintf(v->bus_info, "USB"); | 320 | usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); |
319 | v->version = RADIO_VERSION; | 321 | v->version = RADIO_VERSION; |
320 | v->capabilities = V4L2_CAP_TUNER; | 322 | v->capabilities = V4L2_CAP_TUNER; |
321 | return 0; | 323 | return 0; |