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

[deliverable/linux.git] / drivers / usb / atm / ueagle-atm.c

diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index 4333dc576a12321f4cdd88808ffb7a98dc5efc41..df67815f74e68020076c8b59bcecc8ba0bf3782d 100644 (file)
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -2196,17 +2196,12 @@ static int uea_boot(struct uea_softc *sc)
                load_XILINX_firmware(sc);
 
        intr = kmalloc(size, GFP_KERNEL);
-       if (!intr) {
-               uea_err(INS_TO_USBDEV(sc),
-                      "cannot allocate interrupt package\n");
+       if (!intr)
                goto err0;
-       }
 
        sc->urb_int = usb_alloc_urb(0, GFP_KERNEL);
-       if (!sc->urb_int) {
-               uea_err(INS_TO_USBDEV(sc), "cannot allocate interrupt URB\n");
+       if (!sc->urb_int)
                goto err1;
-       }
 
        usb_fill_int_urb(sc->urb_int, sc->usb_dev,
                         usb_rcvintpipe(sc->usb_dev, UEA_INTR_PIPE),
@@ -2561,10 +2556,8 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
        }
 
        sc = kzalloc(sizeof(struct uea_softc), GFP_KERNEL);
-       if (!sc) {
-               uea_err(usb, "uea_init: not enough memory !\n");
+       if (!sc)
                return -ENOMEM;
-       }
 
        sc->usb_dev = usb;
        usbatm->driver_data = sc;