projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b68cafc
)
[media] em28xx: fix error path in em28xx_start_analog_streaming()
author
Frank Schaefer
<
[email protected]
>
Thu, 10 Oct 2013 18:31:53 +0000
(15:31 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Thu, 17 Oct 2013 09:07:36 +0000
(06:07 -0300)
Increase the streaming_users count only if streaming start succeeds.
Signed-off-by: Frank Schäfer <
[email protected]
>
Signed-off-by: Hans Verkuil <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/media/usb/em28xx/em28xx-video.c
patch
|
blob
|
history
diff --git
a/drivers/media/usb/em28xx/em28xx-video.c
b/drivers/media/usb/em28xx/em28xx-video.c
index 9d103344f34ab5e4e3267ca8fa08f58db1f5a741..fc5d60efd4abe99f19acbafff7b83879da5ff3ac 100644
(file)
--- a/
drivers/media/usb/em28xx/em28xx-video.c
+++ b/
drivers/media/usb/em28xx/em28xx-video.c
@@
-638,7
+638,7
@@
int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
if (rc)
return rc;
- if (dev->streaming_users
++
== 0) {
+ if (dev->streaming_users == 0) {
/* First active streaming user, so allocate all the URBs */
/* Allocate the USB bandwidth */
@@
-657,7
+657,7
@@
int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
dev->packet_multiplier,
em28xx_urb_data_copy);
if (rc < 0)
-
goto fail
;
+
return rc
;
/*
* djh: it's not clear whether this code is still needed. I'm
@@
-675,7
+675,8
@@
int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, &f);
}
-fail:
+ dev->streaming_users++;
+
return rc;
}