Commit 21f836f1 authored by Dann Frazier's avatar Dann Frazier

re-diff to fix build-time application

svn path=/dists/etch-security/linux-2.6/; revision=9285
parent 79d31953
......@@ -15,10 +15,11 @@ Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index 887ef95..12bad8a 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
Backported to Debian's 2.6.18 by dann frazier <dannf@debian.org>
diff -urpN linux-source-2.6.18.orig/drivers/usb/misc/usblcd.c linux-source-2.6.18/drivers/usb/misc/usblcd.c
--- linux-source-2.6.18.orig/drivers/usb/misc/usblcd.c 2006-09-19 21:42:06.000000000 -0600
+++ linux-source-2.6.18/drivers/usb/misc/usblcd.c 2007-08-07 16:12:28.000000000 -0600
@@ -42,10 +42,14 @@ struct usb_lcd {
size_t bulk_in_size; /* the size of the receive buffer */
__u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */
......@@ -33,9 +34,9 @@ index 887ef95..12bad8a 100644
+#define USB_LCD_CONCURRENT_WRITES 5
+
static struct usb_driver lcd_driver;
static DEFINE_MUTEX(usb_lcd_open_mutex);
@@ -186,12 +190,13 @@ static void lcd_write_bulk_callback(struct urb *urb)
@@ -183,12 +187,13 @@ static void lcd_write_bulk_callback(stru
/* free up our allocated buffer */
usb_buffer_free(urb->dev, urb->transfer_buffer_length,
urb->transfer_buffer, urb->transfer_dma);
......@@ -50,7 +51,7 @@ index 887ef95..12bad8a 100644
struct urb *urb = NULL;
char *buf = NULL;
@@ -201,10 +206,16 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, siz
@@ -198,10 +203,16 @@ static ssize_t lcd_write(struct file *fi
if (count == 0)
goto exit;
......@@ -69,7 +70,7 @@ index 887ef95..12bad8a 100644
buf = usb_buffer_alloc(dev->udev, count, GFP_KERNEL, &urb->transfer_dma);
if (!buf) {
@@ -239,6 +250,8 @@ exit:
@@ -236,6 +247,8 @@ exit:
error:
usb_buffer_free(dev->udev, count, buf, urb->transfer_dma);
usb_free_urb(urb);
......@@ -78,7 +79,7 @@ index 887ef95..12bad8a 100644
return retval;
}
@@ -277,6 +290,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
@@ -274,6 +287,7 @@ static int lcd_probe(struct usb_interfac
goto error;
}
kref_init(&dev->kref);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment