History

Merge tag 'usb-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB / PHY fixes from Greg KH: "Here are a number of small USB and PHY driver fixes for 4.9-rc5 Nothing major, just small fixes for reported issues, all of these have been in linux-next for a while with no reported issues" * tag 'usb-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: USB: cdc-acm: fix TIOCMIWAIT cdc-acm: fix uninitialized variable drivers/usb: Skip auto handoff for TI and RENESAS usb controllers usb: musb: remove duplicated actions usb: musb: da8xx: Don't print phy error on -EPROBE_DEFER phy: sun4i: check PMU presence when poking unknown bit of pmu phy-rockchip-pcie: remove deassert of phy_rst from exit callback phy: da8xx-usb: rename the ohci device to ohci-da8xx phy: Add reset callback for not generic phy uwb: fix device reference leaks usb: gadget: u_ether: remove interrupt throttling usb: dwc3: st: add missing <linux/pinctrl/consumer.h> include usb: dwc3: Fix error handling for core init

Linus Torvalds committed 10 years ago

Commit befdfff2 parents 348ce85 182664013 files · +42 −37Browse files

Showing the changes to include/linux (1 of 13 files). Show all

Unified · Split

include/linux/phy/phy.h+7−0
@@ -253,6 +253,13 @@ static inline int phy_set_mode(struct phy *phy, enum phy_mode mode) · 252 unmodified lines
253253 return -ENOSYS;
254254 }
255255
256+static inline int phy_reset(struct phy *phy)
257+{
258+ if (!phy)
259+ return 0;
260+ return -ENOSYS;
261+}
262+
256263 static inline int phy_get_bus_width(struct phy *phy)
257264 {
258265 return -ENOSYS;