Skip to contentSkip to conversation

s2255drv: fix for return code not checked

PATCH New Dean Anderson 1 participant 1 message Feb 5, 2014 Media (V4L/DVB)

lore
Share & tools
lore

Dean Anderson

author
#0 lore raw

PATCH v2 1/1 s2255drv: fix for return code not checked

Start acquisition return code was not being checked. Return error if start acquisition fails.

Signed-off-by Dean Anderson <[email protected]>
---
 drivers/media/usb/s2255/s2255drv.c |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/media/usb/s2255/s2255drv.c +10 -6
index 4c483ad..787b591 100644
@@ -1230,12 +1230,16 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 		vc->buffer.frame[j].cur_size = 0;
 	}
 	res = videobuf_streamon(&fh->vb_vidq);
-	if (res == 0) {
-		s2255_start_acquire(vc);
-		vc->b_acquire = 1;
-	} else
+	if (res != 0) {
 		res_free(fh);
-
+		return res;
+	}
+	res = s2255_start_acquire(vc);
+	if (res != 0) {
+		res_free(fh);
+		return res;
+	}
+	vc->b_acquire = 1;
 	return res;
 }
 

@@ -2373,7 +2377,7 @@ static int s2255_start_acquire(struct s2255_vc *vc)
 
 	dprintk(dev, 2, "start acquire exit[%d] %d\n", vc->idx, res);
 	mutex_unlock(&dev->cmdlock);
-	return 0;
+	return res;
 }
 
 static int s2255_stop_acquire(struct s2255_vc *vc)
Signature · 1 line
1.7.9.5