From: xiechao.mail@gmail.com (Chao Xie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/29] usb: gadget: mv_udc: fix the value of tranceiver
Date: Wed, 21 Nov 2012 21:04:49 -0500 [thread overview]
Message-ID: <1353549910-988-8-git-send-email-xiechao.mail@gmail.com> (raw)
In-Reply-To: <1353549910-988-1-git-send-email-xiechao.mail@gmail.com>
From: Chao Xie <chao.xie@marvell.com>
Signed-off-by: Chao Xie <xiechao.mail@gmail.com>
---
drivers/usb/gadget/mv_udc_core.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index c78d52f..c4adfeb 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -1394,7 +1394,7 @@ static int mv_udc_start(struct usb_gadget *gadget,
spin_unlock_irqrestore(&udc->lock, flags);
- if (!IS_ERR_OR_NULL(udc->transceiver)) {
+ if (udc->transceiver) {
retval = otg_set_peripheral(udc->transceiver->otg,
&udc->gadget);
if (retval) {
@@ -2174,9 +2174,14 @@ static int __devinit mv_udc_probe(struct platform_device *pdev)
udc->dev = pdev;
#ifdef CONFIG_USB_OTG_UTILS
- if (pdata->mode == MV_USB_MODE_OTG)
+ if (pdata->mode == MV_USB_MODE_OTG) {
udc->transceiver = devm_usb_get_phy(&pdev->dev,
USB_PHY_TYPE_USB2);
+ if (IS_ERR_OR_NULL(udc->transceiver)) {
+ udc->transceiver = NULL;
+ return -ENODEV;
+ }
+ }
#endif
udc->clknum = pdata->clknum;
@@ -2319,7 +2324,7 @@ static int __devinit mv_udc_probe(struct platform_device *pdev)
eps_init(udc);
/* VBUS detect: we can disable/enable clock on demand.*/
- if (!IS_ERR_OR_NULL(udc->transceiver))
+ if (udc->transceiver)
udc->clock_gating = 1;
else if (pdata->vbus) {
udc->clock_gating = 1;
@@ -2386,7 +2391,7 @@ static int mv_udc_suspend(struct device *dev)
udc = dev_get_drvdata(dev);
/* if OTG is enabled, the following will be done in OTG driver*/
- if (!IS_ERR_OR_NULL(udc->transceiver))
+ if (udc->transceiver)
return 0;
if (udc->pdata->vbus && udc->pdata->vbus->poll)
@@ -2421,7 +2426,7 @@ static int mv_udc_resume(struct device *dev)
udc = dev_get_drvdata(dev);
/* if OTG is enabled, the following will be done in OTG driver*/
- if (!IS_ERR_OR_NULL(udc->transceiver))
+ if (udc->transceiver)
return 0;
if (!udc->clock_gating) {
--
1.7.4.1
next prev parent reply other threads:[~2012-11-22 2:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-22 2:04 [PATCH 01/29] usb: gadget: mv_udc: use udc_start and udc_stop functions Chao Xie
2012-11-22 2:04 ` [PATCH 02/29] usb: gadget: mv_udc: use devm_xxx for probe Chao Xie
2012-11-22 2:04 ` [PATCH 03/29] usb: gadget: mv_udc: fix the clk APIs Chao Xie
2012-11-22 2:04 ` [PATCH 04/29] usb: otg: mv_otg: use devm_xxx for probe Chao Xie
2012-11-22 2:04 ` [PATCH 05/29] usb: otg: mv_otg: fix the clk APIs Chao Xie
2012-11-22 2:04 ` [PATCH 06/29] usb: host: ehci-mv: fix " Chao Xie
2012-11-23 16:06 ` Alan Stern
2012-11-22 2:04 ` [PATCH 07/29] usb: host: ehci-mv: remove unused variable Chao Xie
2012-11-22 2:04 ` Chao Xie [this message]
2012-11-22 2:04 ` [PATCH 09/29] usb: phy: mv_usb2: add PHY driver for marvell usb2 controller Chao Xie
2012-11-22 2:04 ` [PATCH 10/29] usb: gadget: mv_udc: use PHY driver for udc Chao Xie
2012-11-22 2:04 ` [PATCH 11/29] usb: ehci: ehci-mv: use PHY driver for ehci Chao Xie
2012-11-22 2:04 ` [PATCH 12/29] usb: otg: mv_otg: use PHY driver for otg Chao Xie
2012-11-22 2:04 ` [PATCH 13/29] arm: mmp2: change the defintion of usb devices Chao Xie
2012-11-22 2:04 ` [PATCH 14/29] arm: pxa910: " Chao Xie
2012-11-22 2:04 ` [PATCH 15/29] arm: brownstone: add usb support for the board Chao Xie
2012-11-22 2:04 ` [PATCH 16/29] arm: ttc_dkb: add usb support Chao Xie
2012-11-22 2:04 ` [PATCH 17/29] arm: mmp: remove the usb phy setting Chao Xie
2012-11-22 2:04 ` [PATCH 18/29] arm: mmp: remove usb devices from pxa168 Chao Xie
2012-11-22 2:05 ` [PATCH 19/29] usb: phy: mv_usb2_phy: add externel chip support Chao Xie
2012-11-22 2:05 ` [PATCH 20/29] usb: gadget: mv_udc: add extern " Chao Xie
2012-11-22 2:05 ` [PATCH 21/29] usb: ehci: ehci-mv: " Chao Xie
2012-11-22 2:05 ` [PATCH 22/29] usb: otg: mv_otg: " Chao Xie
2012-11-22 2:05 ` [PATCH 23/29] arm: mmp: add extern chip support for brownstone Chao Xie
2012-11-22 2:05 ` [PATCH 24/29] arm: mmp: add extern chip support for ttc_dkb Chao Xie
2012-11-22 2:05 ` [PATCH 25/29] usb: gadget: mv_udc: add device tree support Chao Xie
2012-11-22 2:05 ` [PATCH 26/29] usb: otg: mv_otg: " Chao Xie
2012-11-22 2:05 ` [PATCH 27/29] usb: ehci: ehci-mv: " Chao Xie
2012-11-22 2:05 ` [PATCH 28/29] arm: mmp: devicetree: add usb support for mmp2 Chao Xie
2012-11-22 2:05 ` [PATCH 29/29] arm: mmp: devicetree: add usb support for pxa910_dkb Chao Xie
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=1353549910-988-8-git-send-email-xiechao.mail@gmail.com \
--to=xiechao.mail@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).