From: ahaslam@baylibre.com
To: gregkh@linuxfoundation.org, robh+dt@kernel.org, nsekhar@ti.com,
stern@rowland.harvard.edu, khilman@baylibre.com,
sshtylyov@ru.mvista.com, david@lechnology.com
Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Axel Haslam <ahaslam@baylibre.com>
Subject: [PATCH/RFT 05/12] USB: ohci-da8xx: Fix probe for devices with no vbus/oci gpio
Date: Fri, 7 Oct 2016 18:42:50 +0200 [thread overview]
Message-ID: <1475858577-10366-6-git-send-email-ahaslam@baylibre.com> (raw)
In-Reply-To: <1475858577-10366-1-git-send-email-ahaslam@baylibre.com>
From: Axel Haslam <ahaslam@baylibre.com>
Some boards dont have gpios assigened for vbus or oci.
Allow these boards to enumerate usb without declaring the set_power
and/or the ocic_notify callbacks in platform data.
Signed-off-by: Axel Haslam <ahaslam@baylibre.com>
---
drivers/usb/host/ohci-da8xx.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 3c85d6c..9d9f8e3 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -215,7 +215,7 @@ static int ohci_da8xx_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
temp ? "Set" : "Clear", wIndex, "POWER");
if (!pdata->set_power)
- return -EPIPE;
+ return 0;
return pdata->set_power(wIndex, temp) ? -EPIPE : 0;
case USB_PORT_FEAT_C_OVER_CURRENT:
@@ -343,10 +343,12 @@ static int usb_hcd_da8xx_probe(const struct hc_driver *driver,
if (pdata->ocic_notify) {
error = pdata->ocic_notify(ohci_da8xx_ocic_handler);
- if (!error)
- return 0;
+ if (error)
+ goto err_notify;
}
+ return 0;
+err_notify:
usb_remove_hcd(hcd);
err:
usb_put_hcd(hcd);
--
2.7.1
next prev parent reply other threads:[~2016-10-07 16:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 16:42 [PATCH/RFT 00/12] Add DT support for ohci-da8xx ahaslam
2016-10-07 16:42 ` [PATCH/RFT 01/12] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable ahaslam
2016-10-07 16:42 ` [PATCH/RFT 02/12] ARM: davinci: hawk: add full constraints for ohci plat boot ahaslam
2016-10-07 16:42 ` [PATCH/RFT 03/12] ARM: davinci: rename root_hub to platform_data ahaslam
2016-10-07 16:42 ` [PATCH/RFT 04/12] USB: ohci-da8xx: Divide power up time in the ohci driver ahaslam
2016-10-07 16:42 ` ahaslam [this message]
2016-10-07 16:42 ` [PATCH/RFT 06/12] ARM: davinci: hawk: Remove oci and vbus gpios ahaslam
2016-10-07 16:42 ` [PATCH/RFT 07/12] USB: ohci-da8xx: Request gpios and handle interrupt in the driver ahaslam
2016-10-10 23:18 ` David Lechner
2016-10-12 15:01 ` Axel Haslam
2016-10-12 23:31 ` David Lechner
2016-10-07 16:42 ` [PATCH/RFT 08/12] ARM: davinci: register the usb20_phy clock on the SoC file ahaslam
2016-10-10 23:27 ` David Lechner
2016-10-07 16:42 ` [PATCH/RFT 09/12] usb: host: ohci-da8xx: Add devicetree bindings documentation ahaslam
2016-10-10 21:35 ` Rob Herring
2016-10-10 23:33 ` David Lechner
2016-10-07 16:42 ` [PATCH/RFT 10/12] USB: ohci-da8xx: Add device tree support ahaslam
2016-10-07 16:42 ` [PATCH/RFT 11/12] ARM: dts: da850: Add the usb ohci device node ahaslam
2016-10-07 17:11 ` Sergei Shtylyov
2016-10-07 16:42 ` [PATCH/RFT 12/12] ARM: dts: da850-lcdk: enable ohci usb ahaslam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475858577-10366-6-git-send-email-ahaslam@baylibre.com \
--to=ahaslam@baylibre.com \
--cc=david@lechnology.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=robh+dt@kernel.org \
--cc=sshtylyov@ru.mvista.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®