Merge "FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum" (6fd762bf) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/usb/gadget/composite.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -1749,6 +1749,18 @@ composite_setup(struct usb_gadget gadget, const struct usb_ctrlrequest ctrl)
		struct usb_function *f = NULL;
		u8 endp;

		if (w_length > USB_COMP_EP0_BUFSIZ) {
		if (ctrl->bRequestType & USB_DIR_IN) {
		/* Cast away the const, we are going to overwrite on purpose. */
		__le16 temp = (__le16 )&ctrl->wLength;

		*temp = cpu_to_le16(USB_COMP_EP0_BUFSIZ);
		w_length = USB_COMP_EP0_BUFSIZ;
		} else {
		goto done;
		}
		}

		/* partial re-init of the response message; the function or the
		* gadget might need to intercept e.g. a control-OUT completion
		* when we delegate to it.
		@@ -2288,8 +2300,7 @@ int composite_dev_prepare(struct usb_composite_driver *composite,
		if (!cdev->req)
		return -ENOMEM;

		cdev->req->buf = kmalloc(USB_COMP_EP0_BUFSIZ +
		(gadget->extra_buf_alloc), GFP_KERNEL);
		cdev->req->buf = kzalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);
		if (!cdev->req->buf)
		goto fail;

+14 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ static int dbgp_enable_ep_req(struct usb_ep *ep)
		goto fail_1;
		}

		req->buf = kmalloc(DBGP_REQ_LEN, GFP_KERNEL);
		req->buf = kzalloc(DBGP_REQ_LEN, GFP_KERNEL);
		if (!req->buf) {
		err = -ENOMEM;
		stp = 2;
		@@ -345,6 +345,19 @@ static int dbgp_setup(struct usb_gadget *gadget,
		void *data = NULL;
		u16 len = 0;

		if (length > DBGP_REQ_LEN) {
		if (ctrl->bRequestType & USB_DIR_IN) {
		/* Cast away the const, we are going to overwrite on purpose. */
		__le16 temp = (__le16 )&ctrl->wLength;

		*temp = cpu_to_le16(DBGP_REQ_LEN);
		length = DBGP_REQ_LEN;
		} else {
		return err;
		}
		}


		if (request == USB_REQ_GET_DESCRIPTOR) {
		switch (value>>8) {
		case USB_DT_DEVICE:

+15 −1

Original line number	Diff line number	Diff line
		@@ -109,6 +109,8 @@ enum ep0_state {
		/* enough for the whole queue: most events invalidate others */
		#define N_EVENT 5

		#define RBUF_SIZE 256

		struct dev_data {
		spinlock_t lock;
		refcount_t count;
		@@ -143,7 +145,7 @@ struct dev_data {
		struct dentry *dentry;

		/* except this scratch i/o buffer for ep0 */
		u8 rbuf [256];
		u8 rbuf[RBUF_SIZE];
		};

		static inline void get_dev (struct dev_data *data)
		@@ -1332,6 +1334,18 @@ gadgetfs_setup (struct usb_gadget gadget, const struct usb_ctrlrequest ctrl)
		u16 w_value = le16_to_cpu(ctrl->wValue);
		u16 w_length = le16_to_cpu(ctrl->wLength);

		if (w_length > RBUF_SIZE) {
		if (ctrl->bRequestType & USB_DIR_IN) {
		/* Cast away the const, we are going to overwrite on purpose. */
		__le16 temp = (__le16 )&ctrl->wLength;

		*temp = cpu_to_le16(RBUF_SIZE);
		w_length = RBUF_SIZE;
		} else {
		return value;
		}
		}

		spin_lock (&dev->lock);
		dev->setup_abort = 0;
		if (dev->state == STATE_DEV_UNCONNECTED) {