From 9cd4ade0832b81ec6f5c30a8026c132692e1fc9a Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Fri, 4 Dec 2009 15:47:43 +0200
Subject: [PATCH] --- yaml --- r: 174998 b: refs/heads/master c:
 2eb5052e2a22b0d9edbca19d099661fdabfc03ca h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/usb/core/hub.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 81b1e7f2ca42..c873b711abcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 719a6e8876ee860fcb0c90d4123bff1e3df26dfd
+refs/heads/master: 2eb5052e2a22b0d9edbca19d099661fdabfc03ca
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index e4b0e28f7453..06af970e1064 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -1676,7 +1676,7 @@ static int usb_configure_device_otg(struct usb_device *udev)
 	if (!udev->bus->is_b_host
 			&& udev->config
 			&& udev->parent == udev->bus->root_hub) {
-		struct usb_otg_descriptor	*desc = 0;
+		struct usb_otg_descriptor	*desc = NULL;
 		struct usb_bus			*bus = udev->bus;
 
 		/* descriptor may appear anywhere in config */