diff options
| author | Wolfram Sang <wsa-dev@sang-engineering.com> | 2016-08-25 19:39:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-30 19:17:38 +0200 |
| commit | a1841732e07e534a2e207c88ae63e7b4a7522d4b (patch) | |
| tree | d7845cb372c173f7fc13fbb7cf21993f148abb35 /drivers/usb/misc/usblcd.c | |
| parent | 58e61402c7f46c792daa2bb32f4686c45bd15f90 (diff) | |
| download | linux-a1841732e07e534a2e207c88ae63e7b4a7522d4b.tar.gz linux-a1841732e07e534a2e207c88ae63e7b4a7522d4b.tar.bz2 linux-a1841732e07e534a2e207c88ae63e7b4a7522d4b.zip | |
usb: misc: usblcd: don't print on ENOMEM
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>
Diffstat (limited to 'drivers/usb/misc/usblcd.c')
| -rw-r--r-- | drivers/usb/misc/usblcd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c index 1184390508e9..9f48419abc46 100644 --- a/drivers/usb/misc/usblcd.c +++ b/drivers/usb/misc/usblcd.c @@ -321,10 +321,8 @@ static int lcd_probe(struct usb_interface *interface, /* allocate memory for our device state and initialize it */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); - if (dev == NULL) { - dev_err(&interface->dev, "Out of memory\n"); + if (!dev) goto error; - } kref_init(&dev->kref); sema_init(&dev->limit_sem, USB_LCD_CONCURRENT_WRITES); init_usb_anchor(&dev->submitted); @@ -351,11 +349,8 @@ static int lcd_probe(struct usb_interface *interface, dev->bulk_in_size = buffer_size; dev->bulk_in_endpointAddr = endpoint->bEndpointAddress; dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); - if (!dev->bulk_in_buffer) { - dev_err(&interface->dev, - "Could not allocate bulk_in_buffer\n"); + if (!dev->bulk_in_buffer) goto error; - } } if (!dev->bulk_out_endpointAddr && |