USB: usb_driver_claim_interface: add sanity checking

[pandora-kernel.git] / drivers / usb / core / driver.c

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index c105ba3..c595714 100644 (file)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -428,9 +428,13 @@ static int usb_unbind_interface(struct device *dev)
 int usb_driver_claim_interface(struct usb_driver *driver,
                                struct usb_interface *iface, void *priv)
 {
 int usb_driver_claim_interface(struct usb_driver *driver,
                                struct usb_interface *iface, void *priv)
 {

-       struct device *dev = &iface->dev;
+       struct device *dev;

        int retval = 0;
 
        int retval = 0;
 

+       if (!iface)
+               return -ENODEV;
+
+       dev = &iface->dev;

        if (dev->driver)
                return -EBUSY;
 
        if (dev->driver)
                return -EBUSY;