aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-09-23 13:38:35 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-09-23 13:38:35 -0700
commit957623b48db9d9106c569c15ed802867186beb86 (patch)
tree19af79766e205296545c0d36ed63a9d526397b81 /usb
parentda61f1b3fdbefb935eaaa0256e57dee89bb3c3cf (diff)
downloadpatches-957623b48db9d9106c569c15ed802867186beb86.tar.gz
usb patches
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-fix-doc-for-usb_autopm_enable.patch38
-rw-r--r--usb/usb-fix-spelling-in-usb-serial.h.patch28
-rw-r--r--usb/usb-ftdi_sio-fix-product-parameter-description.patch2
-rw-r--r--usb/usb-remove-info-macro-from-usb.h.patch8
-rw-r--r--usb/usb-remove-use-of-err-in-drivers-usb-serial.patch40
5 files changed, 91 insertions, 25 deletions
diff --git a/usb/usb-fix-doc-for-usb_autopm_enable.patch b/usb/usb-fix-doc-for-usb_autopm_enable.patch
new file mode 100644
index 00000000000000..406bad21e218b5
--- /dev/null
+++ b/usb/usb-fix-doc-for-usb_autopm_enable.patch
@@ -0,0 +1,38 @@
+From geoff@infradead.org Tue Sep 23 13:21:27 2008
+From: Geoff Levand <geoff@infradead.org>
+Date: Sat, 20 Sep 2008 14:41:47 -0700
+Subject: USB: Fix doc for usb_autopm_enable
+To: linux-usb@vger.kernel.org
+Message-ID: <48D56E1B.7080808@infradead.org>
+
+
+Correct errors in the descriptions for usb_autopm_enable
+and usb_autopm_disable in the USB PM doc.
+
+Signed-off-by: Geoff Levand <geoff@infradead.org>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ Documentation/usb/power-management.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/Documentation/usb/power-management.txt
++++ b/Documentation/usb/power-management.txt
+@@ -350,12 +350,12 @@ without holding the mutex.
+
+ There also are a couple of utility routines drivers can use:
+
+- usb_autopm_enable() sets pm_usage_cnt to 1 and then calls
+- usb_autopm_set_interface(), which will attempt an autoresume.
+-
+- usb_autopm_disable() sets pm_usage_cnt to 0 and then calls
++ usb_autopm_enable() sets pm_usage_cnt to 0 and then calls
+ usb_autopm_set_interface(), which will attempt an autosuspend.
+
++ usb_autopm_disable() sets pm_usage_cnt to 1 and then calls
++ usb_autopm_set_interface(), which will attempt an autoresume.
++
+ The conventional usage pattern is that a driver calls
+ usb_autopm_get_interface() in its open routine and
+ usb_autopm_put_interface() in its close or release routine. But
diff --git a/usb/usb-fix-spelling-in-usb-serial.h.patch b/usb/usb-fix-spelling-in-usb-serial.h.patch
new file mode 100644
index 00000000000000..90f37fb1b45a45
--- /dev/null
+++ b/usb/usb-fix-spelling-in-usb-serial.h.patch
@@ -0,0 +1,28 @@
+From geoff@infradead.org Tue Sep 23 13:22:04 2008
+From: Geoff Levand <geoff@infradead.org>
+Date: Sat, 20 Sep 2008 14:41:47 -0700
+Subject: USB: Fix spelling in usb/serial.h
+To: linux-usb@vger.kernel.org
+Message-ID: <48D56E1B.7080808@infradead.org>
+
+
+Fixes a minor typo in the comments for usb_set_serial_data.
+
+Signed-off-by: Geoff Levand <geoff@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/usb/serial.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/usb/serial.h
++++ b/include/linux/usb/serial.h
+@@ -192,7 +192,7 @@ static inline void usb_set_serial_data(s
+ * The driver.owner field should be set to the module owner of this driver.
+ * The driver.name field should be set to the name of this driver (remember
+ * it will show up in sysfs, so it needs to be short and to the point.
+- * Useing the module name is a good idea.)
++ * Using the module name is a good idea.)
+ */
+ struct usb_serial_driver {
+ const char *description;
diff --git a/usb/usb-ftdi_sio-fix-product-parameter-description.patch b/usb/usb-ftdi_sio-fix-product-parameter-description.patch
index db593163e957dc..540ca38b183fdf 100644
--- a/usb/usb-ftdi_sio-fix-product-parameter-description.patch
+++ b/usb/usb-ftdi_sio-fix-product-parameter-description.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -2453,5 +2453,5 @@ module_param(vendor, ushort, 0);
+@@ -2455,5 +2455,5 @@ module_param(vendor, ushort, 0);
MODULE_PARM_DESC(vendor, "User specified vendor ID (default="
__MODULE_STRING(FTDI_VID)")");
module_param(product, ushort, 0);
diff --git a/usb/usb-remove-info-macro-from-usb.h.patch b/usb/usb-remove-info-macro-from-usb.h.patch
index 3900cee9882c88..46067e9c77c27b 100644
--- a/usb/usb-remove-info-macro-from-usb.h.patch
+++ b/usb/usb-remove-info-macro-from-usb.h.patch
@@ -2422,7 +2422,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
failed_usb_register:
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -1151,7 +1151,7 @@ static void ftdi_determine_type(struct u
+@@ -1153,7 +1153,7 @@ static void ftdi_determine_type(struct u
/* Assume its an FT232R */
priv->chip_type = FT232RL;
}
@@ -2431,7 +2431,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
-@@ -1407,7 +1407,8 @@ static int ftdi_jtag_probe(struct usb_se
+@@ -1409,7 +1409,8 @@ static int ftdi_jtag_probe(struct usb_se
dbg("%s", __func__);
if (interface == udev->actconfig->interface[0]) {
@@ -2441,7 +2441,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return -ENODEV;
}
-@@ -1425,7 +1426,8 @@ static int ftdi_mtxorb_hack_setup(struct
+@@ -1427,7 +1428,8 @@ static int ftdi_mtxorb_hack_setup(struct
if (ep->enabled && ep_desc->wMaxPacketSize == 0) {
ep_desc->wMaxPacketSize = cpu_to_le16(0x40);
@@ -2451,7 +2451,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
return 0;
-@@ -2420,7 +2422,8 @@ static int __init ftdi_init(void)
+@@ -2422,7 +2424,8 @@ static int __init ftdi_init(void)
if (retval)
goto failed_usb_register;
diff --git a/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch b/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch
index 5e74a4cfac81a0..bc3dbcfa83530c 100644
--- a/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch
+++ b/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch
@@ -528,7 +528,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -858,7 +858,8 @@ static int update_mctrl(struct usb_seria
+@@ -860,7 +860,8 @@ static int update_mctrl(struct usb_seria
kfree(buf);
if (rv < 0) {
@@ -538,7 +538,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
__func__,
(set & TIOCM_DTR) ? "HIGH" :
(clear & TIOCM_DTR) ? "LOW" : "unchanged",
-@@ -1324,7 +1325,7 @@ static int ftdi_sio_port_probe(struct us
+@@ -1326,7 +1327,7 @@ static int ftdi_sio_port_probe(struct us
priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);
if (!priv) {
@@ -547,7 +547,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sizeof(struct ftdi_private));
return -ENOMEM;
}
-@@ -1521,8 +1522,9 @@ static int ftdi_open(struct tty_struct *
+@@ -1523,8 +1524,9 @@ static int ftdi_open(struct tty_struct *
ftdi_read_bulk_callback, port);
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
if (result)
@@ -559,7 +559,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return result;
-@@ -1556,7 +1558,7 @@ static void ftdi_close(struct tty_struct
+@@ -1558,7 +1560,7 @@ static void ftdi_close(struct tty_struct
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0, priv->interface, buf, 0,
WDR_TIMEOUT) < 0) {
@@ -568,7 +568,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
/* drop RTS and DTR */
-@@ -1621,14 +1623,15 @@ static int ftdi_write(struct tty_struct
+@@ -1623,14 +1625,15 @@ static int ftdi_write(struct tty_struct
buffer = kmalloc(transfer_size, GFP_ATOMIC);
if (!buffer) {
@@ -586,7 +586,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
count = -ENOMEM;
goto error_no_urb;
}
-@@ -1672,8 +1675,9 @@ static int ftdi_write(struct tty_struct
+@@ -1674,8 +1677,9 @@ static int ftdi_write(struct tty_struct
status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) {
@@ -598,7 +598,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
count = status;
goto error;
} else {
-@@ -1780,7 +1784,8 @@ static int ftdi_chars_in_buffer(struct t
+@@ -1782,7 +1786,8 @@ static int ftdi_chars_in_buffer(struct t
buffered = (int)priv->tx_outstanding_bytes;
spin_unlock_irqrestore(&priv->tx_lock, flags);
if (buffered < 0) {
@@ -608,7 +608,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
buffered = 0;
}
return buffered;
-@@ -1796,11 +1801,12 @@ static void ftdi_read_bulk_callback(stru
+@@ -1798,11 +1803,12 @@ static void ftdi_read_bulk_callback(stru
int status = urb->status;
if (urb->number_of_packets > 0) {
@@ -626,7 +626,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
dbg("%s - port %d", __func__, port->number);
-@@ -1821,7 +1827,7 @@ static void ftdi_read_bulk_callback(stru
+@@ -1823,7 +1829,7 @@ static void ftdi_read_bulk_callback(stru
}
if (urb != port->read_urb)
@@ -635,7 +635,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (status) {
/* This will happen at close every time so it is a dbg not an
-@@ -1923,7 +1929,8 @@ static void ftdi_process_read(struct wor
+@@ -1925,7 +1931,8 @@ static void ftdi_process_read(struct wor
length = min(PKTSZ, urb->actual_length-packet_offset)-2;
if (length < 0) {
@@ -645,7 +645,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
length = 0;
}
-@@ -2038,8 +2045,9 @@ static void ftdi_process_read(struct wor
+@@ -2040,8 +2047,9 @@ static void ftdi_process_read(struct wor
result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
if (result)
@@ -657,7 +657,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
} /* ftdi_process_read */
-@@ -2066,8 +2074,8 @@ static void ftdi_break_ctl(struct tty_st
+@@ -2068,8 +2076,8 @@ static void ftdi_break_ctl(struct tty_st
FTDI_SIO_SET_DATA_REQUEST_TYPE,
urb_value , priv->interface,
buf, 0, WDR_TIMEOUT) < 0) {
@@ -668,7 +668,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
dbg("%s break state is %d - urb is %d", __func__,
-@@ -2139,7 +2147,7 @@ static void ftdi_set_termios(struct tty_
+@@ -2141,7 +2149,7 @@ static void ftdi_set_termios(struct tty_
case CS7: urb_value |= 7; dbg("Setting CS7"); break;
case CS8: urb_value |= 8; dbg("Setting CS8"); break;
default:
@@ -677,7 +677,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
-@@ -2152,7 +2160,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2154,7 +2162,8 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_DATA_REQUEST_TYPE,
urb_value , priv->interface,
buf, 0, WDR_SHORT_TIMEOUT) < 0) {
@@ -687,7 +687,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
/* Now do the baudrate */
-@@ -2163,14 +2172,17 @@ static void ftdi_set_termios(struct tty_
+@@ -2165,14 +2174,17 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0, priv->interface,
buf, 0, WDR_TIMEOUT) < 0) {
@@ -707,7 +707,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* Ensure RTS and DTR are raised when baudrate changed from 0 */
if (!old_termios || (old_termios->c_cflag & CBAUD) == B0)
set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
-@@ -2186,7 +2198,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2188,7 +2200,8 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0 , (FTDI_SIO_RTS_CTS_HS | priv->interface),
buf, 0, WDR_TIMEOUT) < 0) {
@@ -717,7 +717,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
} else {
-@@ -2217,7 +2230,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2219,7 +2232,8 @@ static void ftdi_set_termios(struct tty_
urb_value , (FTDI_SIO_XON_XOFF_HS
| priv->interface),
buf, 0, WDR_TIMEOUT) < 0) {
@@ -727,7 +727,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
} else {
/* else clause to only run if cflag ! CRTSCTS and iflag
-@@ -2230,7 +2244,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2232,7 +2246,8 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0, priv->interface,
buf, 0, WDR_TIMEOUT) < 0) {
@@ -737,7 +737,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
-@@ -2256,8 +2271,8 @@ static int ftdi_tiocmget(struct tty_stru
+@@ -2258,8 +2273,8 @@ static int ftdi_tiocmget(struct tty_stru
0, 0,
buf, 1, WDR_TIMEOUT);
if (ret < 0) {
@@ -748,7 +748,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return ret;
}
break;
-@@ -2275,8 +2290,8 @@ static int ftdi_tiocmget(struct tty_stru
+@@ -2277,8 +2292,8 @@ static int ftdi_tiocmget(struct tty_stru
0, priv->interface,
buf, 2, WDR_TIMEOUT);
if (ret < 0) {
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 20:42:07 +0000