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

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

Merge tag 'fixes-for-v3.19-rc6' of... 

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

 into usb-linus

Felipe writes:

usb: fixes for v3.19-rc6

Just two fixes pending. A fix USB PHY for non-OF case and
a fix for dwc2 running on samsung SoC.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parents e5dff0e8 0df8fc37

drivers/usb/dwc2/core_intr.c

+3 −3
Original line number Diff line number Diff line
@@ -476,13 +476,13 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev) 
	u32 gintsts;

	irqreturn_t retval = IRQ_NONE;



	spin_lock(&hsotg->lock);



	if (!dwc2_is_controller_alive(hsotg)) {

		dev_warn(hsotg->dev, "Controller is dead\n");

		goto out;

	}



	spin_lock(&hsotg->lock);



	gintsts = dwc2_read_common_intr(hsotg);

	if (gintsts & ~GINTSTS_PRTINT)

		retval = IRQ_HANDLED;
@@ -515,8 +515,8 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev) 
		}

	}



	spin_unlock(&hsotg->lock);

out:

	spin_unlock(&hsotg->lock);

	return retval;

}

EXPORT_SYMBOL_GPL(dwc2_handle_common_intr);

drivers/usb/phy/phy.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static struct usb_phy *__usb_find_phy(struct list_head *list, 
		return phy;

	}



	return ERR_PTR(-EPROBE_DEFER);

	return ERR_PTR(-ENODEV);

}



static struct usb_phy *__usb_find_phy_dev(struct device *dev,