From d30187e19fa529c99ff90c17ea89f6bd62d40551 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Tue, 31 May 2011 17:54:40 -0300 Subject: [PATCH] --- yaml --- r: 261203 b: refs/heads/master c: f54ba7f199d63cea08b8cc7114cb6c5cd9a042ab h: refs/heads/master i: 261201: b6c9328747cd64a93447d7d3751aa36a02171d88 261199: 2eb86cb2a8d94659b129b9ff84e6b30b60e474e1 v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/si470x/radio-si470x-usb.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d25fafa76913..67d4b8d0efc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fabc6b85ca1d364f4e3fdcf80f80b393a508e771 +refs/heads/master: f54ba7f199d63cea08b8cc7114cb6c5cd9a042ab diff --git a/trunk/drivers/media/radio/si470x/radio-si470x-usb.c b/trunk/drivers/media/radio/si470x/radio-si470x-usb.c index 392e84fe90ef..ccefdaea4dc5 100644 --- a/trunk/drivers/media/radio/si470x/radio-si470x-usb.c +++ b/trunk/drivers/media/radio/si470x/radio-si470x-usb.c @@ -699,7 +699,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, radio->videodev = video_device_alloc(); if (!radio->videodev) { retval = -ENOMEM; - goto err_intbuffer; + goto err_urb; } memcpy(radio->videodev, &si470x_viddev_template, sizeof(si470x_viddev_template)); @@ -790,6 +790,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, kfree(radio->buffer); err_video: video_device_release(radio->videodev); +err_urb: + usb_free_urb(radio->int_in_urb); err_intbuffer: kfree(radio->int_in_buffer); err_radio: