diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-17 11:03:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-17 11:03:56 -0700 |
| commit | 20830b91dc1ebcd38ad468e0a55771009ab2297f (patch) | |
| tree | 03552f2e145a6b266a8a94070fd8574593f22b8b /usb | |
| parent | 7e926f6ab5af32814eee5557a85581394a60237a (diff) | |
| download | patches-20830b91dc1ebcd38ad468e0a55771009ab2297f.tar.gz | |
htc dream patches, and a usb option device id
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-serial-full-autosuspend-support-for-the-option-driver.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/usb/usb-serial-full-autosuspend-support-for-the-option-driver.patch b/usb/usb-serial-full-autosuspend-support-for-the-option-driver.patch index cc6597d11e1913..2719354f600137 100644 --- a/usb/usb-serial-full-autosuspend-support-for-the-option-driver.patch +++ b/usb/usb-serial-full-autosuspend-support-for-the-option-driver.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -583,6 +583,7 @@ static struct usb_driver option_driver = +@@ -585,6 +585,7 @@ static struct usb_driver option_driver = #ifdef CONFIG_PM .suspend = usb_serial_suspend, .resume = usb_serial_resume, @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif .id_table = option_ids, .no_dynamic_id = 1, -@@ -630,6 +631,12 @@ static int debug; +@@ -632,6 +633,12 @@ static int debug; #define IN_BUFLEN 4096 #define OUT_BUFLEN 4096 @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct option_port_private { /* Input endpoints and buffer for this port */ struct urb *in_urbs[N_IN_URB]; -@@ -638,6 +645,8 @@ struct option_port_private { +@@ -640,6 +647,8 @@ struct option_port_private { struct urb *out_urbs[N_OUT_URB]; u8 *out_buffer[N_OUT_URB]; unsigned long out_busy; /* Bit vector of URBs in use */ @@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Settings for the port */ int rts_state; /* Handshaking pins (outputs) */ -@@ -684,12 +693,17 @@ module_exit(option_exit); +@@ -686,12 +695,17 @@ module_exit(option_exit); static int option_probe(struct usb_serial *serial, const struct usb_device_id *id) { @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -746,12 +760,15 @@ static int option_write(struct tty_struc +@@ -748,12 +762,15 @@ static int option_write(struct tty_struc const unsigned char *buf, int count) { struct option_port_private *portdata; @@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s: write (%d chars)", __func__, count); -@@ -773,17 +790,33 @@ static int option_write(struct tty_struc +@@ -775,17 +792,33 @@ static int option_write(struct tty_struc dbg("%s: endpoint %d buf %d", __func__, usb_pipeendpoint(this_urb->pipe), i); @@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> portdata->tx_start_time[i] = jiffies; buf += todo; left -= todo; -@@ -827,7 +860,10 @@ static void option_indat_callback(struct +@@ -829,7 +862,10 @@ static void option_indat_callback(struct if (err) printk(KERN_ERR "%s: resubmit read urb failed. " "(%d)", __func__, err); @@ -138,7 +138,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return; } -@@ -836,15 +872,21 @@ static void option_outdat_callback(struc +@@ -838,15 +874,21 @@ static void option_outdat_callback(struc { struct usb_serial_port *port; struct option_port_private *portdata; @@ -161,7 +161,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> for (i = 0; i < N_OUT_URB; ++i) { if (portdata->out_urbs[i] == urb) { smp_mb__before_clear_bit(); -@@ -955,10 +997,13 @@ static int option_open(struct tty_struct +@@ -957,10 +999,13 @@ static int option_open(struct tty_struct struct usb_serial_port *port, struct file *filp) { struct option_port_private *portdata; @@ -175,7 +175,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s", __func__); -@@ -977,6 +1022,12 @@ static int option_open(struct tty_struct +@@ -979,6 +1024,12 @@ static int option_open(struct tty_struct option_send_setup(port); @@ -188,7 +188,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -1001,16 +1052,23 @@ static void option_close(struct usb_seri +@@ -1003,16 +1054,23 @@ static void option_close(struct usb_seri int i; struct usb_serial *serial = port->serial; struct option_port_private *portdata; @@ -212,7 +212,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -1115,6 +1173,7 @@ static int option_startup(struct usb_ser +@@ -1117,6 +1175,7 @@ static int option_startup(struct usb_ser __func__, i); return 1; } @@ -220,7 +220,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> for (j = 0; j < N_IN_URB; j++) { buffer = (u8 *)__get_free_page(GFP_KERNEL); -@@ -1217,18 +1276,52 @@ static void option_release(struct usb_se +@@ -1219,18 +1278,52 @@ static void option_release(struct usb_se #ifdef CONFIG_PM static int option_suspend(struct usb_serial *serial, pm_message_t message) { @@ -275,7 +275,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s entered", __func__); /* get the interrupt URBs resubmitted unconditionally */ -@@ -1243,7 +1336,7 @@ static int option_resume(struct usb_seri +@@ -1245,7 +1338,7 @@ static int option_resume(struct usb_seri if (err < 0) { err("%s: Error %d for interrupt URB of port%d", __func__, err, i); @@ -284,7 +284,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -1251,27 +1344,32 @@ static int option_resume(struct usb_seri +@@ -1253,27 +1346,32 @@ static int option_resume(struct usb_seri /* walk all ports */ port = serial->port[i]; portdata = usb_get_serial_port_data(port); |