refresh patches for 2.6.30-rc4

SVN-Revision: 15548
owl
Imre Kaloz 2009-05-01 21:37:32 +00:00
parent 8738678fbf
commit 6a2d23513d
3 changed files with 4 additions and 4 deletions

View File

@ -687,7 +687,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/stat.h> #include <linux/stat.h>
@@ -1673,7 +1676,11 @@ int dev_hard_start_xmit(struct sk_buff * @@ -1678,7 +1681,11 @@ int dev_hard_start_xmit(struct sk_buff *
int rc; int rc;
if (likely(!skb->next)) { if (likely(!skb->next)) {

View File

@ -8,7 +8,7 @@
static int debug; static int debug;
/* initially all NULL */ /* initially all NULL */
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
@@ -841,7 +842,7 @@ int usb_serial_probe(struct usb_interfac @@ -857,7 +858,7 @@ int usb_serial_probe(struct usb_interfac
dev_err(&interface->dev, "No free urbs available\n"); dev_err(&interface->dev, "No free urbs available\n");
goto probe_error; goto probe_error;
} }
@ -17,7 +17,7 @@
port->bulk_in_size = buffer_size; port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
@@ -1279,3 +1280,5 @@ MODULE_LICENSE("GPL"); @@ -1311,3 +1312,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR); module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not"); MODULE_PARM_DESC(debug, "Debug enabled or not");

View File

@ -824,7 +824,7 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2490,6 +2490,11 @@ T: git git://git.kernel.org/pub/scm/linu @@ -2487,6 +2487,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained S: Maintained
F: drivers/media/video/gspca/ F: drivers/media/video/gspca/