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

Commit c24cb6c8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v3.13-rc2' of... 

Merge tag 'fixes-for-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

usb: fixes for v3.13-rc2

First set of fixes for this -rc cycle. A few important
fixes which should be backported to stable kernels and
the usual set of sparse warning fixes. There's also a
regression fix on phy-generic.c which would prevent
am335x-based platforms from having their PHY drivers
probed.

Signed-of-by: default avatarFelipe Balbi <balbi@ti.com>
parents 043e3f83 2cf93bea

drivers/usb/dwc3/ep0.c

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, 
			dep = dwc3_wIndex_to_dep(dwc, wIndex);

			if (!dep)

				return -EINVAL;

			if (set == 0 && (dep->flags & DWC3_EP_WEDGE))

				break;

			ret = __dwc3_gadget_ep_set_halt(dep, set);

			if (ret)

				return -EINVAL;

drivers/usb/dwc3/gadget.c

+1 −4
Original line number Diff line number Diff line
@@ -1200,9 +1200,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) 
		else

			dep->flags |= DWC3_EP_STALL;

	} else {

		if (dep->flags & DWC3_EP_WEDGE)

			return 0;



		ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,

			DWC3_DEPCMD_CLEARSTALL, &params);

		if (ret)
@@ -1210,7 +1207,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) 
					value ? "set" : "clear",

					dep->name);

		else

			dep->flags &= ~DWC3_EP_STALL;

			dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE);

	}



	return ret;

drivers/usb/gadget/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ config USB_CONFIGFS_PHONET 
config USB_CONFIGFS_MASS_STORAGE

	boolean "Mass storage"

	depends on USB_CONFIGFS

	depends on BLOCK

	select USB_F_MASS_STORAGE

	help

	  The Mass Storage Gadget acts as a USB Mass Storage disk drive.

drivers/usb/gadget/composite.c

+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ static void reset_config(struct usb_composite_dev *cdev) 
		bitmap_zero(f->endpoints, 32);

	}

	cdev->config = NULL;

	cdev->delayed_status = 0;

}



static int set_config(struct usb_composite_dev *cdev,

drivers/usb/gadget/f_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ static struct ffs_data *ffs_data_new(void) 
{

	struct ffs_data *ffs = kzalloc(sizeof *ffs, GFP_KERNEL);

	if (unlikely(!ffs))

		return 0;

		return NULL;



	ENTER();