UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] stk1160: Stop device and unqueue buffers when start_streaming() 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>
This commit is contained in:
Ezequiel Garcia 2012-08-19 21:23:46 -03:00 committed by Mauro Carvalho Chehab
parent c6b69c6c58
commit 8ac456495a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/usb/stk1160/stk1160-v4l.c
View File

@ -184,7 +184,7 @@ static int stk1160_start_streaming(struct stk1160 *dev)
if (!dev->isoc_ctl.num_bufs || new_pkt_size) { if (!dev->isoc_ctl.num_bufs || new_pkt_size) {
rc = stk1160_alloc_isoc(dev); rc = stk1160_alloc_isoc(dev);
if (rc < 0) if (rc < 0)
goto out_unlock; goto out_stop_hw;
} }
/* submit urbs and enables IRQ */ /* submit urbs and enables IRQ */
@ -192,8 +192,7 @@ static int stk1160_start_streaming(struct stk1160 *dev)
rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_KERNEL); rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_KERNEL);
if (rc) { if (rc) {
stk1160_err("cannot submit urb[%d] (%d)\n", i, rc); stk1160_err("cannot submit urb[%d] (%d)\n", i, rc);
stk1160_uninit_isoc(dev); goto out_uninit;
goto out_unlock;
} }
} }
@ -206,7 +205,16 @@ static int stk1160_start_streaming(struct stk1160 *dev)
stk1160_dbg("streaming started\n"); 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); mutex_unlock(&dev->v4l_lock);
return rc; return rc;