aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/iuu_phoenix.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index d65414888349..ddff37fa6339 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -318,11 +318,10 @@ static int bulk_immediate(struct usb_serial_port *port, u8 *buf, u8 count)
318 port->bulk_out_endpointAddress), buf, 318 port->bulk_out_endpointAddress), buf,
319 count, &actual, HZ * 1); 319 count, &actual, HZ * 1);
320 320
321 if (status != IUU_OPERATION_OK) { 321 if (status != IUU_OPERATION_OK)
322 dbg("%s - error = %2x", __func__, status); 322 dbg("%s - error = %2x", __func__, status);
323 } else { 323 else
324 dbg("%s - write OK !", __func__); 324 dbg("%s - write OK !", __func__);
325 }
326 return status; 325 return status;
327} 326}
328 327
@@ -342,12 +341,10 @@ static int read_immediate(struct usb_serial_port *port, u8 *buf, u8 count)
342 port->bulk_in_endpointAddress), buf, 341 port->bulk_in_endpointAddress), buf,
343 count, &actual, HZ * 1); 342 count, &actual, HZ * 1);
344 343
345 if (status != IUU_OPERATION_OK) { 344 if (status != IUU_OPERATION_OK)
346 dbg("%s - error = %2x", __func__, status); 345 dbg("%s - error = %2x", __func__, status);
347 } else { 346 else
348 dbg("%s - read OK !", __func__); 347 dbg("%s - read OK !", __func__);
349 }
350
351 return status; 348 return status;
352} 349}
353 350
@@ -770,14 +767,14 @@ static int iuu_uart_write(struct tty_struct *tty, struct usb_serial_port *port,
770 if (priv->writelen > 0) { 767 if (priv->writelen > 0) {
771 /* buffer already filled but not commited */ 768 /* buffer already filled but not commited */
772 spin_unlock_irqrestore(&priv->lock, flags); 769 spin_unlock_irqrestore(&priv->lock, flags);
773 return (0); 770 return 0;
774 } 771 }
775 /* fill the buffer */ 772 /* fill the buffer */
776 memcpy(priv->writebuf, buf, count); 773 memcpy(priv->writebuf, buf, count);
777 priv->writelen = count; 774 priv->writelen = count;
778 spin_unlock_irqrestore(&priv->lock, flags); 775 spin_unlock_irqrestore(&priv->lock, flags);
779 776
780 return (count); 777 return count;
781} 778}
782 779
783static void read_rxcmd_callback(struct urb *urb) 780static void read_rxcmd_callback(struct urb *urb)