Search
SailfishOS Open Build Service
>
Projects
>
nemo
:
devel:hw
:
nv:tegra3:nexus7
>
kernel-adaptation-google-nexus7
> 0001-Fix-g_multi-USB-gadget-support-on-Nexus7.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File 0001-Fix-g_multi-USB-gadget-support-on-Nexus7.patch of Package kernel-adaptation-google-nexus7
From 8a7b355ec92450b965d1f975c1467ba6cfd1eaf9 Mon Sep 17 00:00:00 2001 From: Ruediger Gad <r.c.g@gmx.de> Date: Thu, 13 Dec 2012 09:51:31 +0100 Subject: [PATCH] Fix g_multi USB gadget support on Nexus7. Signed-off-by: Ruediger Gad <r.c.g@gmx.de> --- drivers/usb/gadget/fsl_udc_core.c | 6 +++--- drivers/usb/gadget/multi.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 258127a..2311bf9 100755 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -134,7 +134,7 @@ static int fsl_charging_current = 0; static struct delayed_work smb347_hc_mode_work; extern int smb347_hc_mode_callback(bool enable, int cur); -extern void fsl_wake_lock_timeout(void); +//extern void fsl_wake_lock_timeout(void); /* Export the function "unsigned int get_usb_cable_status(void)" for others to query the USB cable status. */ unsigned int get_usb_cable_status(void) @@ -3423,7 +3423,7 @@ static int fsl_udc_resume(struct platform_device *pdev) /* if there is no VBUS then power down the clocks and return */ fsl_udc_clk_suspend(false); if(s_cable_info.udc_vbus_active == 0 && s_cable_info.is_active == 1) { - fsl_wake_lock_timeout(); +// fsl_wake_lock_timeout(); mutex_lock(&s_cable_info.cable_info_mutex); s_cable_info.udc_vbus_active = 1; s_cable_info.is_active = 0; @@ -3457,7 +3457,7 @@ static int fsl_udc_resume(struct platform_device *pdev) fsl_udc_clk_suspend(false); if((s_cable_info.udc_vbus_active == 1 && s_cable_info.is_active == 0) || (s_cable_info.udc_vbus_active == 0 && s_cable_info.is_active == 0)) { - fsl_wake_lock_timeout(); +// fsl_wake_lock_timeout(); mutex_lock(&s_cable_info.cable_info_mutex); s_cable_info.udc_vbus_active = 0; s_cable_info.is_active = 1; diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c index 8c7b747..e5e7cf0 100644 --- a/drivers/usb/gadget/multi.c +++ b/drivers/usb/gadget/multi.c @@ -173,7 +173,7 @@ static __init int rndis_do_config(struct usb_configuration *c) c->bmAttributes |= USB_CONFIG_ATT_WAKEUP; } - ret = rndis_bind_config(c, hostaddr); + ret = rndis_bind_config(c, hostaddr, 0, 0); if (ret < 0) return ret; -- 1.8.0