From: Manish Narani <manish.narani@xilinx.com>
To: <peter.chen@kernel.org>, <gregkh@linuxfoundation.org>,
<michal.simek@xilinx.com>
Cc: <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<git@xilinx.com>, Manish Narani <manish.narani@xilinx.com>,
"Subbaraya Sundeep Bhatta" <sbhatta@xilinx.com>
Subject: [PATCH 3/6] usb: chipidea: Check usb_phy exists before using it
Date: Tue, 24 Aug 2021 22:46:15 +0530 [thread overview]
Message-ID: <1629825378-8089-4-git-send-email-manish.narani@xilinx.com> (raw)
In-Reply-To: <1629825378-8089-1-git-send-email-manish.narani@xilinx.com>
usb_phy and usb_phy->set_vbus may not be present all the times
based on PHY driver used. So check for it.
Signed-off-by: Subbaraya Sundeep Bhatta <sbhatta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Manish Narani <manish.narani@xilinx.com>
---
drivers/usb/chipidea/otg_fsm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
index 2f7f94d..5f8f5d2 100644
--- a/drivers/usb/chipidea/otg_fsm.c
+++ b/drivers/usb/chipidea/otg_fsm.c
@@ -472,7 +472,8 @@ static void ci_otg_drv_vbus(struct otg_fsm *fsm, int on)
}
}
- if (ci->platdata->flags & CI_HDRC_PHY_VBUS_CONTROL)
+ if (ci->platdata->flags & CI_HDRC_PHY_VBUS_CONTROL &&
+ ci->usb_phy && ci->usb_phy->set_vbus)
ci->usb_phy->set_vbus(ci->usb_phy, 1);
/* Disable data pulse irq */
@@ -484,7 +485,8 @@ static void ci_otg_drv_vbus(struct otg_fsm *fsm, int on)
if (ci->platdata->reg_vbus)
regulator_disable(ci->platdata->reg_vbus);
- if (ci->platdata->flags & CI_HDRC_PHY_VBUS_CONTROL)
+ if (ci->platdata->flags & CI_HDRC_PHY_VBUS_CONTROL &&
+ ci->usb_phy && ci->usb_phy->set_vbus)
ci->usb_phy->set_vbus(ci->usb_phy, 0);
fsm->a_bus_drop = 1;
--
2.1.1
next prev parent reply other threads:[~2021-08-24 17:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 17:16 [PATCH 0/6] Chipidea USB driver Enhancements and Bug Fixes Manish Narani
2021-08-24 17:16 ` [PATCH 1/6] usb: chipidea: Add support for VBUS control with PHY Manish Narani
2021-10-07 4:44 ` Peter Chen
2021-10-08 4:59 ` Jun Li
2021-08-24 17:16 ` [PATCH 2/6] usb: chipidea: Use usb2 phy for Zynq platform Manish Narani
2021-10-07 4:52 ` Peter Chen
2021-08-24 17:16 ` Manish Narani [this message]
2021-10-07 4:54 ` [PATCH 3/6] usb: chipidea: Check usb_phy exists before using it Peter Chen
2021-08-24 17:16 ` [PATCH 4/6] usb: chipidea: Fix return value handling Manish Narani
2021-08-24 17:16 ` [PATCH 5/6] usb: chipidea: core: Add return value function check Manish Narani
2021-10-07 5:00 ` Peter Chen
2021-08-24 17:16 ` [PATCH 6/6] usb: chipidea: udc: Add xilinx revision support Manish Narani
2021-10-07 5:02 ` Peter Chen
2021-10-07 5:03 ` Peter Chen
2021-10-07 5:12 ` [PATCH 0/6] Chipidea USB driver Enhancements and Bug Fixes Peter Chen
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=1629825378-8089-4-git-send-email-manish.narani@xilinx.com \
--to=manish.narani@xilinx.com \
--cc=git@xilinx.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=peter.chen@kernel.org \
--cc=sbhatta@xilinx.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.