mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
82 lines
2.6 KiB
Diff
82 lines
2.6 KiB
Diff
From 34491f4f5c53bc499adfe6eec7c146592f295bed Mon Sep 17 00:00:00 2001
|
|
From: Johan Hovold <jhovold@gmail.com>
|
|
Date: Tue, 29 May 2012 17:57:52 +0200
|
|
Subject: [PATCH 52/67] USB: option: fix port-data abuse
|
|
|
|
commit 4273f9878b0a8271df055e3c8f2e7f08c6a4a2f4 upstream.
|
|
|
|
Commit 8b4c6a3ab596961b78465 ("USB: option: Use generic USB wwan code")
|
|
moved option port-data allocation to usb_wwan_startup but still cast the
|
|
port data to the old struct...
|
|
|
|
Signed-off-by: Johan Hovold <jhovold@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
[bwh: Backported to 3.2: adjust context]
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/usb/serial/option.c | 34 +++-------------------------------
|
|
1 file changed, 3 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
|
|
index ef57b1e..5be3915 100644
|
|
--- a/drivers/usb/serial/option.c
|
|
+++ b/drivers/usb/serial/option.c
|
|
@@ -1269,35 +1269,6 @@ static struct usb_serial_driver option_1port_device = {
|
|
|
|
static int debug;
|
|
|
|
-/* per port private data */
|
|
-
|
|
-#define N_IN_URB 4
|
|
-#define N_OUT_URB 4
|
|
-#define IN_BUFLEN 4096
|
|
-#define OUT_BUFLEN 4096
|
|
-
|
|
-struct option_port_private {
|
|
- /* Input endpoints and buffer for this port */
|
|
- struct urb *in_urbs[N_IN_URB];
|
|
- u8 *in_buffer[N_IN_URB];
|
|
- /* Output endpoints and buffer for this port */
|
|
- struct urb *out_urbs[N_OUT_URB];
|
|
- u8 *out_buffer[N_OUT_URB];
|
|
- unsigned long out_busy; /* Bit vector of URBs in use */
|
|
- int opened;
|
|
- struct usb_anchor delayed;
|
|
-
|
|
- /* Settings for the port */
|
|
- int rts_state; /* Handshaking pins (outputs) */
|
|
- int dtr_state;
|
|
- int cts_state; /* Handshaking pins (inputs) */
|
|
- int dsr_state;
|
|
- int dcd_state;
|
|
- int ri_state;
|
|
-
|
|
- unsigned long tx_start_time[N_OUT_URB];
|
|
-};
|
|
-
|
|
/* Functions used by new usb-serial code. */
|
|
static int __init option_init(void)
|
|
{
|
|
@@ -1400,7 +1371,8 @@ static void option_instat_callback(struct urb *urb)
|
|
int err;
|
|
int status = urb->status;
|
|
struct usb_serial_port *port = urb->context;
|
|
- struct option_port_private *portdata = usb_get_serial_port_data(port);
|
|
+ struct usb_wwan_port_private *portdata =
|
|
+ usb_get_serial_port_data(port);
|
|
|
|
dbg("%s", __func__);
|
|
dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
|
|
@@ -1461,7 +1433,7 @@ static int option_send_setup(struct usb_serial_port *port)
|
|
struct usb_serial *serial = port->serial;
|
|
struct usb_wwan_intf_private *intfdata =
|
|
(struct usb_wwan_intf_private *) serial->private;
|
|
- struct option_port_private *portdata;
|
|
+ struct usb_wwan_port_private *portdata;
|
|
int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
|
|
int val = 0;
|
|
dbg("%s", __func__);
|
|
--
|
|
1.7.9.5
|
|
|