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

Commit aed328fe authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/usb-ep-check-v2' into for-next 



Pull another fix of URB EP type check.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 727dede0 f9a1c372

sound/usb/usx2y/usb_stream.c

+17 −6
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void playback_prep_freqn(struct usb_stream_kernel *sk, struct urb *urb) 
		    lb, s->period_size);

}



static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,

static int init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,

			   struct urb **urbs, char *transfer,

			   struct usb_device *dev, int pipe)

{
@@ -77,6 +77,8 @@ static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize, 
		urb->interval = 1;

		if (usb_pipeout(pipe))

			continue;

		if (usb_urb_ep_type_check(urb))

			return -EINVAL;



		urb->transfer_buffer_length = transfer_length;

		desc = urb->iso_frame_desc;
@@ -87,9 +89,11 @@ static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize, 
			desc[p].length = maxpacket;

		}

	}



	return 0;

}



static void init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,

static int init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,

		      struct usb_device *dev, int in_pipe, int out_pipe)

{

	struct usb_stream	*s = sk->s;
@@ -103,9 +107,12 @@ static void init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize, 
		sk->outurb[u] = usb_alloc_urb(sk->n_o_ps, GFP_KERNEL);

	}



	init_pipe_urbs(sk, use_packsize, sk->inurb, indata, dev, in_pipe);

	if (init_pipe_urbs(sk, use_packsize, sk->inurb, indata, dev, in_pipe) ||

	    init_pipe_urbs(sk, use_packsize, sk->outurb, sk->write_page, dev,

		       out_pipe);

			   out_pipe))

		return -EINVAL;



	return 0;

}
@@ -226,7 +233,11 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk, 
	else

		sk->freqn = get_usb_high_speed_rate(sample_rate);



	init_urbs(sk, use_packsize, dev, in_pipe, out_pipe);

	if (init_urbs(sk, use_packsize, dev, in_pipe, out_pipe) < 0) {

		usb_stream_free(sk);

		return NULL;

	}



	sk->s->state = usb_stream_stopped;

out:

	return sk->s;