Merge remote-tracking branch 'usb/usb-next'

[deliverable/linux.git] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 1d5fc32d06d007a6f64526a531da8ae69e8e6950..b48dc76385b652ac5c3bd27b2555e35e59d6eaa9 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1823,10 +1823,8 @@ descriptor_error:
        dev_info(&intf->dev, "USB hub found\n");
 
        hub = kzalloc(sizeof(*hub), GFP_KERNEL);
-       if (!hub) {
-               dev_dbg(&intf->dev, "couldn't kmalloc hub struct\n");
+       if (!hub)
                return -ENOMEM;
-       }
 
        kref_init(&hub->kref);
        hub->intfdev = &intf->dev;
@@ -5337,11 +5335,10 @@ static int descriptors_changed(struct usb_device *udev,
        }
 
        buf = kmalloc(len, GFP_NOIO);
-       if (buf == NULL) {
-               dev_err(&udev->dev, "no mem to re-read configs after reset\n");
+       if (!buf)
                /* assume the worst */
                return 1;
-       }
+
        for (index = 0; index < udev->descriptor.bNumConfigurations; index++) {
                old_length = le16_to_cpu(udev->config[index].desc.wTotalLength);
                length = usb_get_descriptor(udev, USB_DT_CONFIG, index, buf,