Commit 42844992 authored by Oliver Neukum's avatar Oliver Neukum Committed by Hans Verkuil
Browse files

media: rc: streamzap: Error handling in probe 



If submitting the URB fails, the device will be unusable.
Probe() must fail.

Fixes: 7a569f52 ("V4L/DVB: IR/streamzap: functional in-kernel decoding")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent dccc0c3d

drivers/media/rc/streamzap.c

+8 −4
Original line number Diff line number Diff line
@@ -219,9 +219,8 @@ static void streamzap_callback(struct urb *urb) 
	case -ESHUTDOWN:

		/*

		 * this urb is terminated, clean up.

		 * sz might already be invalid at this point

		 */

		dev_err(sz->dev, "urb terminated, status: %d\n", urb->status);

		dev_dbg(sz->dev, "urb terminated, status: %d\n", urb->status);

		return;

	default:

		break;
@@ -358,11 +357,16 @@ static int streamzap_probe(struct usb_interface *intf, 


	usb_set_intfdata(intf, sz);



	if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))

	retval = usb_submit_urb(sz->urb_in, GFP_ATOMIC);

	if (retval < 0) {

		dev_err(sz->dev, "urb submit failed\n");

		goto rc_submit_fail;

	}



	return 0;



rc_submit_fail:

	rc_free_device(sz->rdev);

	usb_set_intfdata(intf, NULL);

rc_dev_fail:

	usb_free_urb(sz->urb_in);

free_buf_in: