diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/media/video/gspca/gspca.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 7be69284da03..ac95c55887df 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
| @@ -459,6 +459,7 @@ static int create_urbs(struct gspca_dev *gspca_dev, | |||
| 459 | urb = usb_alloc_urb(npkt, GFP_KERNEL); | 459 | urb = usb_alloc_urb(npkt, GFP_KERNEL); |
| 460 | if (!urb) { | 460 | if (!urb) { |
| 461 | err("usb_alloc_urb failed"); | 461 | err("usb_alloc_urb failed"); |
| 462 | destroy_urbs(gspca_dev); | ||
| 462 | return -ENOMEM; | 463 | return -ENOMEM; |
| 463 | } | 464 | } |
| 464 | urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev, | 465 | urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev, |
| @@ -468,8 +469,8 @@ static int create_urbs(struct gspca_dev *gspca_dev, | |||
| 468 | 469 | ||
| 469 | if (urb->transfer_buffer == NULL) { | 470 | if (urb->transfer_buffer == NULL) { |
| 470 | usb_free_urb(urb); | 471 | usb_free_urb(urb); |
| 471 | destroy_urbs(gspca_dev); | ||
| 472 | err("usb_buffer_urb failed"); | 472 | err("usb_buffer_urb failed"); |
| 473 | destroy_urbs(gspca_dev); | ||
| 473 | return -ENOMEM; | 474 | return -ENOMEM; |
| 474 | } | 475 | } |
| 475 | gspca_dev->urb[n] = urb; | 476 | gspca_dev->urb[n] = urb; |