diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-24 09:24:19 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-24 09:24:19 -0400 |
| commit | 089ba422528530140fa8ac41d6942d5d33226839 (patch) | |
| tree | 0f899095c126c7a9f513bdddb84565662471cd3d | |
| parent | a38a011d05350df3acd689a3eb4429bfe997edaa (diff) | |
| download | longterm-queue-2.6.34-089ba422528530140fa8ac41d6942d5d33226839.tar.gz | |
fix mislocation in drivers/usb/serial/spcp8x5.c
Thanks to Libor Pechacek for catching this.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/USB-serial-handle-Data-Carrier-Detect-changes.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/queue/USB-serial-handle-Data-Carrier-Detect-changes.patch b/queue/USB-serial-handle-Data-Carrier-Detect-changes.patch index 24a5855..f4706c2 100644 --- a/queue/USB-serial-handle-Data-Carrier-Detect-changes.patch +++ b/queue/USB-serial-handle-Data-Carrier-Detect-changes.patch @@ -1,4 +1,4 @@ -From 08a77cf6cff85104fd191b8e0b0b6decdabc7575 Mon Sep 17 00:00:00 2001 +From 38d8e289c9ac6f5b6df94816ce1583ab9764e562 Mon Sep 17 00:00:00 2001 From: Libor Pechacek <lpechacek@suse.cz> Date: Fri, 14 Jan 2011 14:30:21 +0100 Subject: [PATCH] USB: serial: handle Data Carrier Detect changes @@ -224,7 +224,7 @@ index 89609e1..f6e4703 100644 static void pl2303_read_int_callback(struct urb *urb) diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c -index 2ea32c5..0fbe183 100644 +index 2ea32c5..706f46f 100644 --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c @@ -137,7 +137,7 @@ struct spcp8x5_usb_ctrl_arg { @@ -236,17 +236,17 @@ index 2ea32c5..0fbe183 100644 #define UART_DCD 0x01 #define UART_DSR 0x02 #define UART_BREAK_ERROR 0x04 -@@ -726,6 +726,10 @@ static void spcp8x5_read_bulk_callback(struct urb *urb) - /* overrun is special, not associated with a char */ - if (status & UART_OVERRUN_ERROR) - tty_insert_flip_char(tty, 0, TTY_OVERRUN); -+ if (status & UART_DCD) -+ usb_serial_handle_dcd_change(port, tty, -+ priv->line_status & MSR_STATUS_LINE_DCD); -+ - tty_insert_flip_string_fixed_flag(tty, data, tty_flag, +@@ -730,6 +730,10 @@ static void spcp8x5_read_bulk_callback(struct urb *urb) urb->actual_length); tty_flip_buffer_push(tty); + } ++ ++ if (status & UART_DCD) ++ usb_serial_handle_dcd_change(port, tty, ++ priv->line_status & MSR_STATUS_LINE_DCD); + tty_kref_put(tty); + + /* Schedule the next read */ diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 0a458b8..453ab95 100644 --- a/include/linux/usb/serial.h |