diff options
Diffstat (limited to 'drivers/media/radio/si470x/radio-si470x-usb.c')
-rw-r--r-- | drivers/media/radio/si470x/radio-si470x-usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c index 392e84fe90ef..4cf537043f99 100644 --- a/drivers/media/radio/si470x/radio-si470x-usb.c +++ b/drivers/media/radio/si470x/radio-si470x-usb.c | |||
@@ -29,7 +29,6 @@ | |||
29 | 29 | ||
30 | /* driver definitions */ | 30 | /* driver definitions */ |
31 | #define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>" | 31 | #define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>" |
32 | #define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 10) | ||
33 | #define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver" | 32 | #define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver" |
34 | #define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers" | 33 | #define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers" |
35 | #define DRIVER_VERSION "1.0.10" | 34 | #define DRIVER_VERSION "1.0.10" |
@@ -626,7 +625,6 @@ int si470x_vidioc_querycap(struct file *file, void *priv, | |||
626 | strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card)); | 625 | strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card)); |
627 | usb_make_path(radio->usbdev, capability->bus_info, | 626 | usb_make_path(radio->usbdev, capability->bus_info, |
628 | sizeof(capability->bus_info)); | 627 | sizeof(capability->bus_info)); |
629 | capability->version = DRIVER_KERNEL_VERSION; | ||
630 | capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | | 628 | capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | |
631 | V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE; | 629 | V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE; |
632 | 630 | ||
@@ -699,7 +697,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, | |||
699 | radio->videodev = video_device_alloc(); | 697 | radio->videodev = video_device_alloc(); |
700 | if (!radio->videodev) { | 698 | if (!radio->videodev) { |
701 | retval = -ENOMEM; | 699 | retval = -ENOMEM; |
702 | goto err_intbuffer; | 700 | goto err_urb; |
703 | } | 701 | } |
704 | memcpy(radio->videodev, &si470x_viddev_template, | 702 | memcpy(radio->videodev, &si470x_viddev_template, |
705 | sizeof(si470x_viddev_template)); | 703 | sizeof(si470x_viddev_template)); |
@@ -790,6 +788,8 @@ err_all: | |||
790 | kfree(radio->buffer); | 788 | kfree(radio->buffer); |
791 | err_video: | 789 | err_video: |
792 | video_device_release(radio->videodev); | 790 | video_device_release(radio->videodev); |
791 | err_urb: | ||
792 | usb_free_urb(radio->int_in_urb); | ||
793 | err_intbuffer: | 793 | err_intbuffer: |
794 | kfree(radio->int_in_buffer); | 794 | kfree(radio->int_in_buffer); |
795 | err_radio: | 795 | err_radio: |