Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / drivers / media / usb / stkwebcam / stk-webcam.c

diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index c21c4c004f9778a50809c27d0cba39ca9596d7f7..db200c9d796d3683d23b9279db73d6eb625420da 100644 (file)
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -452,10 +452,8 @@ static int stk_prepare_iso(struct stk_camera *dev)
                        STK_ERROR("isobuf data already allocated\n");
                if (dev->isobufs[i].urb == NULL) {
                        urb = usb_alloc_urb(ISO_FRAMES_PER_DESC, GFP_KERNEL);
-                       if (urb == NULL) {
-                               STK_ERROR("Failed to allocate URB %d\n", i);
+                       if (urb == NULL)
                                goto isobufs_out;
-                       }
                        dev->isobufs[i].urb = urb;
                } else {
                        STK_ERROR("Killing URB\n");