Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 032f1ddf authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: fix error path in em28xx_start_analog_streaming() 



Increase the streaming_users count only if streaming start succeeds.

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent b68cafc5

drivers/media/usb/em28xx/em28xx-video.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

}