aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/opticon.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-12-29 13:22:56 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-03 15:31:46 -0500
commit10c642d0772ac1391ae4f9fdeb13217ab019117a (patch)
treef7fe3b80ca13ff03fde6ec4b5d46aa1063a4c4dc /drivers/usb/serial/opticon.c
parent4d5147ec90531d11e7677e2c38941fc18e160641 (diff)
USB: serial: remove redundant OOM messages
Remove redundant error messages on allocation failures, which have already been logged. Cc: Joe Perches <joe@perches.com> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/opticon.c')
-rw-r--r--drivers/usb/serial/opticon.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 1b4f1d2479c1..90c77b20c883 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -200,15 +200,12 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,
200 200
201 buffer = kmalloc(count, GFP_ATOMIC); 201 buffer = kmalloc(count, GFP_ATOMIC);
202 if (!buffer) { 202 if (!buffer) {
203 dev_err(&port->dev, "out of memory\n");
204 count = -ENOMEM; 203 count = -ENOMEM;
205
206 goto error_no_buffer; 204 goto error_no_buffer;
207 } 205 }
208 206
209 urb = usb_alloc_urb(0, GFP_ATOMIC); 207 urb = usb_alloc_urb(0, GFP_ATOMIC);
210 if (!urb) { 208 if (!urb) {
211 dev_err(&port->dev, "no more free urbs\n");
212 count = -ENOMEM; 209 count = -ENOMEM;
213 goto error_no_urb; 210 goto error_no_urb;
214 } 211 }
@@ -221,7 +218,6 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,
221 * to transmit data to de barcode device the control endpoint is used */ 218 * to transmit data to de barcode device the control endpoint is used */
222 dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO); 219 dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO);
223 if (!dr) { 220 if (!dr) {
224 dev_err(&port->dev, "out of memory\n");
225 count = -ENOMEM; 221 count = -ENOMEM;
226 goto error_no_dr; 222 goto error_no_dr;
227 } 223 }