summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSwaminathan S <swami.iyer@ti.com>2009-12-15 12:29:57 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-23 20:34:13 +0100
commita2396a32b848a9864f933ced860192c72c769aca (patch)
treecb51e45d9548d1d7bb32ad4b99be16e9c9f5f919
parentUSB: musb: MAINTAINERS: Fix my tree's address (diff)
downloadlinux-a2396a32b848a9864f933ced860192c72c769aca.tar.xz
linux-a2396a32b848a9864f933ced860192c72c769aca.zip
USB: musb: Populate the VBUS GPIO with the correct GPIO number
This fixes a null-pointer dereference bug. Signed-off-by: Swaminathan S <swami.iyer@ti.com> Cc: David Brownell <dbrownell@users.sourceforge.net> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Acked-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/musb/davinci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index e16ff605c458..66913811af5e 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -42,7 +42,7 @@
#include "musb_core.h"
#ifdef CONFIG_MACH_DAVINCI_EVM
-#define GPIO_nVBUS_DRV 144
+#define GPIO_nVBUS_DRV 160
#endif
#include "davinci.h"