Skip to content

Commit

Permalink
[media] stk1160: Stop device and unqueue buffers when start_streaming…
Browse files Browse the repository at this point in the history
…() fails

If start_streaming() fails (e.g. out of memory) the driver needs to
rewind the start procedure. This implies possibly stopping the device
and clearing the buffer queue.

Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
ezequielgarcia authored and Mauro Carvalho Chehab committed Sep 25, 2012
1 parent c6b69c6 commit 8ac4564
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions drivers/media/usb/stk1160/stk1160-v4l.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,16 +184,15 @@ static int stk1160_start_streaming(struct stk1160 *dev)
if (!dev->isoc_ctl.num_bufs || new_pkt_size) {
rc = stk1160_alloc_isoc(dev);
if (rc < 0)
goto out_unlock;
goto out_stop_hw;
}

/* submit urbs and enables IRQ */
for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_KERNEL);
if (rc) {
stk1160_err("cannot submit urb[%d] (%d)\n", i, rc);
stk1160_uninit_isoc(dev);
goto out_unlock;
goto out_uninit;
}
}

Expand All @@ -206,7 +205,16 @@ static int stk1160_start_streaming(struct stk1160 *dev)

stk1160_dbg("streaming started\n");

out_unlock:
mutex_unlock(&dev->v4l_lock);

return 0;

out_uninit:
stk1160_uninit_isoc(dev);
out_stop_hw:
usb_set_interface(dev->udev, 0, 0);
stk1160_clear_queue(dev);

mutex_unlock(&dev->v4l_lock);

return rc;
Expand Down

0 comments on commit 8ac4564

Please sign in to comment.