summaryrefslogtreecommitdiffstats
path: root/drivers/usb/renesas_usbhs/mod.c
diff options
context:
space:
mode:
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>2019-06-25 14:38:48 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-26 10:33:08 +0800
commitccc3264c2481c9bcbacfe935dc024aaab4423204 (patch)
treea103ecaa93b8c5a7034bbae244d954f7f2d36bc4 /drivers/usb/renesas_usbhs/mod.c
parentedcf2b2c6629feac147e1a0abdbb3408769ff7e7 (diff)
downloadlinux-stable-ccc3264c2481c9bcbacfe935dc024aaab4423204.tar.gz
linux-stable-ccc3264c2481c9bcbacfe935dc024aaab4423204.tar.bz2
linux-stable-ccc3264c2481c9bcbacfe935dc024aaab4423204.zip
usb: renesas_usbhs: Avoid to write platform_data's value
The very old commit 482982062f1b ("usb: gadget: renesas_usbhs: bugfix: don't modify platform data") changed to use copied whole structures values to fix the "hung-up" issue. However, we also can fix the issue if the driver copies the get_vbus function pointer to the driver's value. So, this patch adds get_vbus member into struct usbhs_mod_info and use the pointer instead of struct renesas_usbhs_platform_callback. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/renesas_usbhs/mod.c')
-rw-r--r--drivers/usb/renesas_usbhs/mod.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c
index 984bb2fff8b8..ddf0153dcf16 100644
--- a/drivers/usb/renesas_usbhs/mod.c
+++ b/drivers/usb/renesas_usbhs/mod.c
@@ -42,12 +42,19 @@ void usbhs_mod_autonomy_mode(struct usbhs_priv *priv)
{
struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
- info->irq_vbus = usbhsm_autonomy_irq_vbus;
- priv->pfunc.get_vbus = usbhsm_autonomy_get_vbus;
+ info->irq_vbus = usbhsm_autonomy_irq_vbus;
+ info->get_vbus = usbhsm_autonomy_get_vbus;
usbhs_irq_callback_update(priv, NULL);
}
+void usbhs_mod_non_autonomy_mode(struct usbhs_priv *priv)
+{
+ struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
+
+ info->get_vbus = priv->pfunc.get_vbus;
+}
+
/*
* host / gadget functions
*