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

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

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 0406a59f05510cb1dee98ffbf22b55c0ccd65750..5ab5c1a81462b621d335b2f3a9ef40268dc73a99 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1760,17 +1760,14 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
                nintf = cp->desc.bNumInterfaces;
                new_interfaces = kmalloc(nintf * sizeof(*new_interfaces),
                                GFP_NOIO);
-               if (!new_interfaces) {
-                       dev_err(&dev->dev, "Out of memory\n");
+               if (!new_interfaces)
                        return -ENOMEM;
-               }
 
                for (; n < nintf; ++n) {
                        new_interfaces[n] = kzalloc(
                                        sizeof(struct usb_interface),
                                        GFP_NOIO);
                        if (!new_interfaces[n]) {
-                               dev_err(&dev->dev, "Out of memory\n");
                                ret = -ENOMEM;
 free_interfaces:
                                while (--n >= 0)