From 4bcc593ad967fd7ff1c30f61cb6ea5dc91b8c1a0 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 17 Mar 2010 15:42:29 -0400 Subject: [PATCH] USB: gadget: android: check for null _android_dev in android_register_function() This fixes a load ordering issue that occurred if a function driver loads before the android gadget driver is initialized. Signed-off-by: Mike Lockwood --- drivers/usb/gadget/android.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 70e48ac3e2a9..3c4d44d663c0 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -313,7 +313,7 @@ void android_register_function(struct android_usb_function *f) /* bind our functions if they have all registered * and the main driver has bound. */ - if (dev->config && _registered_function_count == dev->num_functions) + if (dev && dev->config && _registered_function_count == dev->num_functions) bind_functions(dev); } -- 2.34.1