usb: misc: adutux: don't print on ENOMEM
authorWolfram Sang <wsa-dev@sang-engineering.com>
Thu, 25 Aug 2016 17:39:11 +0000 (19:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 30 Aug 2016 17:17:37 +0000 (19:17 +0200)
All kmalloc-based functions print enough information on failures.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/adutux.c

index c34a0b6..564268f 100644 (file)
@@ -672,8 +672,7 @@ static int adu_probe(struct usb_interface *interface,
 
        /* allocate memory for our device state and initialize it */
        dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL);
-       if (dev == NULL) {
-               dev_err(&interface->dev, "Out of memory\n");
+       if (!dev) {
                retval = -ENOMEM;
                goto exit;
        }
@@ -710,7 +709,6 @@ static int adu_probe(struct usb_interface *interface,
 
        dev->read_buffer_primary = kmalloc((4 * in_end_size), GFP_KERNEL);
        if (!dev->read_buffer_primary) {
-               dev_err(&interface->dev, "Couldn't allocate read_buffer_primary\n");
                retval = -ENOMEM;
                goto error;
        }
@@ -723,7 +721,6 @@ static int adu_probe(struct usb_interface *interface,
 
        dev->read_buffer_secondary = kmalloc((4 * in_end_size), GFP_KERNEL);
        if (!dev->read_buffer_secondary) {
-               dev_err(&interface->dev, "Couldn't allocate read_buffer_secondary\n");
                retval = -ENOMEM;
                goto error;
        }
@@ -735,10 +732,8 @@ static int adu_probe(struct usb_interface *interface,
        memset(dev->read_buffer_secondary + (3 * in_end_size), 'h', in_end_size);
 
        dev->interrupt_in_buffer = kmalloc(in_end_size, GFP_KERNEL);
-       if (!dev->interrupt_in_buffer) {
-               dev_err(&interface->dev, "Couldn't allocate interrupt_in_buffer\n");
+       if (!dev->interrupt_in_buffer)
                goto error;
-       }
 
        /* debug code prime the buffer */
        memset(dev->interrupt_in_buffer, 'i', in_end_size);
@@ -747,10 +742,8 @@ static int adu_probe(struct usb_interface *interface,
        if (!dev->interrupt_in_urb)
                goto error;
        dev->interrupt_out_buffer = kmalloc(out_end_size, GFP_KERNEL);
-       if (!dev->interrupt_out_buffer) {
-               dev_err(&interface->dev, "Couldn't allocate interrupt_out_buffer\n");
+       if (!dev->interrupt_out_buffer)
                goto error;
-       }
        dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!dev->interrupt_out_urb)
                goto error;