From b4375ba23d54ede16c9dd14b3e9d2bee19e6c61c Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 19 May 2010 00:01:34 +0200 Subject: [PATCH] --- yaml --- r: 195527 b: refs/heads/master c: e421fe97adf96a2b1f9d89140ec3e184f0cb7d7c h: refs/heads/master i: 195525: 2e264f037e72834097f4e1e55f1e8c296e1f2037 195523: 555b29d9bb7bf487edc4ec06f7b5a58e894730cf 195519: 45faa97225330aa9bc1ec72728ddf9bc8aa0fa6c v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ir-usb.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 41ce95637a11..a7f9d8ba36ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f26c2889a4d937371e2ec9b5690ac407f0496634 +refs/heads/master: e421fe97adf96a2b1f9d89140ec3e184f0cb7d7c diff --git a/trunk/drivers/usb/serial/ir-usb.c b/trunk/drivers/usb/serial/ir-usb.c index e7087f9fe479..ccbce4066d04 100644 --- a/trunk/drivers/usb/serial/ir-usb.c +++ b/trunk/drivers/usb/serial/ir-usb.c @@ -307,6 +307,7 @@ static int ir_prepare_write_buffer(struct usb_serial_port *port, void *dest, size_t size) { unsigned char *buf = dest; + int count; /* * 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; - return kfifo_out_locked(&port->write_fifo, buf + 1, size - 1, + count = kfifo_out_locked(&port->write_fifo, buf + 1, size - 1, &port->lock); + return count + 1; } static void ir_process_read_urb(struct urb *urb)