aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/io_edgeport.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-02-10 07:20:51 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-10 13:21:04 -0500
commit22a416c4e0f2179b57028e084ac0ed2c110333bd (patch)
treeb885af923a343b1e7eb45ff3bd33e3c8a4526334 /drivers/usb/serial/io_edgeport.c
parentf1475a00a11b07e6ac7f97971466c1bfbf491957 (diff)
USB: serial: use dev_err_console in custom write paths
Use dev_err_console in write paths for devices which can be used as a console but do not use the generic write implementation. Compile-only tested. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/io_edgeport.c')
-rw-r--r--drivers/usb/serial/io_edgeport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 0497575e4799..616b07862771 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1286,7 +1286,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
1286 count = fifo->count; 1286 count = fifo->count;
1287 buffer = kmalloc(count+2, GFP_ATOMIC); 1287 buffer = kmalloc(count+2, GFP_ATOMIC);
1288 if (buffer == NULL) { 1288 if (buffer == NULL) {
1289 dev_err(&edge_port->port->dev, 1289 dev_err_console(edge_port->port,
1290 "%s - no more kernel memory...\n", __func__); 1290 "%s - no more kernel memory...\n", __func__);
1291 edge_port->write_in_progress = false; 1291 edge_port->write_in_progress = false;
1292 goto exit_send; 1292 goto exit_send;
@@ -1331,7 +1331,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
1331 status = usb_submit_urb(urb, GFP_ATOMIC); 1331 status = usb_submit_urb(urb, GFP_ATOMIC);
1332 if (status) { 1332 if (status) {
1333 /* something went wrong */ 1333 /* something went wrong */
1334 dev_err(&edge_port->port->dev, 1334 dev_err_console(edge_port->port,
1335 "%s - usb_submit_urb(write bulk) failed, status = %d, data lost\n", 1335 "%s - usb_submit_urb(write bulk) failed, status = %d, data lost\n",
1336 __func__, status); 1336 __func__, status);
1337 edge_port->write_in_progress = false; 1337 edge_port->write_in_progress = false;