Merge tag 'fixes-for-v3.19-rc5' of... (06087cb4) · Commits · 戴 / test

drivers/usb/gadget/legacy/inode.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -441,6 +441,7 @@ ep_write (struct file fd, const char __user buf, size_t len, loff_t *ptr)
		kbuf = memdup_user(buf, len);
		if (IS_ERR(kbuf)) {
		value = PTR_ERR(kbuf);
		kbuf = NULL;
		goto free1;
		}

+11 −1

Original line number	Diff line number	Diff line
		@@ -828,7 +828,7 @@ static int usba_ep_dequeue(struct usb_ep _ep, struct usb_request _req)
		{
		struct usba_ep *ep = to_usba_ep(_ep);
		struct usba_udc *udc = ep->udc;
		struct usba_request *req = to_usba_req(_req);
		struct usba_request *req;
		unsigned long flags;
		u32 status;

		@@ -837,6 +837,16 @@ static int usba_ep_dequeue(struct usb_ep _ep, struct usb_request _req)

		spin_lock_irqsave(&udc->lock, flags);

		list_for_each_entry(req, &ep->queue, queue) {
		if (&req->req == _req)
		break;
		}

		if (&req->req != _req) {
		spin_unlock_irqrestore(&udc->lock, flags);
		return -EINVAL;
		}

		if (req->using_dma) {
		/*
		* If this request is currently being transferred,

+9 −3

Original line number	Diff line number	Diff line
		@@ -59,6 +59,9 @@ static struct usb_phy __of_usb_find_phy(struct device_node node)
		{
		struct usb_phy *phy;

		if (!of_device_is_available(node))
		return ERR_PTR(-ENODEV);

		list_for_each_entry(phy, &phy_list, head) {
		if (node != phy->dev->of_node)
		continue;
		@@ -190,10 +193,13 @@ struct usb_phy devm_usb_get_phy_by_phandle(struct device dev,
		spin_lock_irqsave(&phy_lock, flags);

		phy = __of_usb_find_phy(node);
		if (IS_ERR(phy) \|\| !try_module_get(phy->dev->driver->owner)) {
		if (!IS_ERR(phy))
		phy = ERR_PTR(-ENODEV);
		if (IS_ERR(phy)) {
		devres_free(ptr);
		goto err1;
		}

		if (!try_module_get(phy->dev->driver->owner)) {
		phy = ERR_PTR(-ENODEV);
		devres_free(ptr);
		goto err1;
		}