lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: ir-usb: fix incorrect write-buffer length

Browse Source 
Returned length should include header length.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Johan Hovold
2010-05-19 00:01:34 +02:00
committed by Greg Kroah-Hartman
parent f26c2889a4
commit e421fe97ad
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/serial/ir-usb.c
View File

@@ -307,6 +307,7 @@ static int ir_prepare_write_buffer(struct usb_serial_port *port,
void *dest, size_t size) void *dest, size_t size)
{ {
unsigned char *buf = dest; unsigned char *buf = dest;
int count;
/* /*
* The first byte of the packet we send to the device contains an * The first byte of the packet we send to the device contains an
@@ -317,8 +318,9 @@ static int ir_prepare_write_buffer(struct usb_serial_port *port,
*/ */
*buf = ir_xbof | ir_baud; *buf = ir_xbof | ir_baud;
return kfifo_out_locked(&port->write_fifo, buf + 1, size - 1, count = kfifo_out_locked(&port->write_fifo, buf + 1, size - 1,
&port->lock); &port->lock);
return count + 1;
} }
static void ir_process_read_urb(struct urb *urb) static void ir_process_read_urb(struct urb *urb)