Attachment 155659 Details for Bug 236736 – Patch "X3"

[patch] Patch "X3"

linux-2.6.22-rc3-usblp-X3.diff (text/plain), 1.99 KB, created by Pete Zaitcev on 2007-05-30 05:44:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2007-05-30 05:44:39 UTC

Size: 1.99 KB

patch

obsolete

>diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
>index 6778f9a..a529031 100644
>--- a/drivers/usb/class/usblp.c
>+++ b/drivers/usb/class/usblp.c
>@@ -149,6 +151,7 @@ struct usblp {
> 	int			minor;			/* minor number of device */
> 	int			wcomplete;		/* writing is completed */
> 	int			rcomplete;		/* reading is completed */
>+	int			paper;			/* were out of paper */
> 	unsigned int		quirks;			/* quirks flags */
> 	unsigned char		used;			/* True if open */
> 	unsigned char		present;		/* True if not disconnected */
>@@ -303,6 +306,7 @@ static void usblp_bulk_write(struct urb *urb)
> 	if (unlikely(urb->status))
> 		warn("usblp%d: nonzero read/write bulk status received: %d",
> 			usblp->minor, urb->status);
>+	usblp->paper = 0;
> 	usblp->wcomplete = 1;
> unplug:
> 	wake_up_interruptible(&usblp->wait);
>@@ -458,7 +462,7 @@ static unsigned int usblp_poll(struct file *file, struct poll_table_struct *wait
> 	struct usblp *usblp = file->private_data;
> 	poll_wait(file, &usblp->wait, wait);
>  	return ((!usblp->bidir || !usblp->rcomplete) ? 0 : POLLIN  | POLLRDNORM)
>- 			       | (!usblp->wcomplete ? 0 : POLLOUT | POLLWRNORM);
>+	     | ((usblp->paper || !usblp->wcomplete) ? 0 : POLLOUT | POLLWRNORM);
> }
> 
> static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>@@ -696,6 +702,12 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
> 				err = usblp_check_status(usblp, err);
> 			mutex_unlock (&usblp->mut);
> 
>+			if (!usblp->wcomplete && err == 1) { /* Paper out */
>+				usblp->paper = 1;
>+				writecount += transfer_length;
>+				return writecount ? writecount : -ENOSPC;
>+			}
>+
> 			/* if the fault was due to disconnect, let khubd's
> 			 * call to usblp_disconnect() grab usblp->mut ...
> 			 */
>@@ -729,6 +741,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
> 		usblp->wcomplete = 0;
> 		err = usb_submit_urb(usblp->writeurb, GFP_KERNEL);
> 		if (err) {
>+			usblp->paper = 0;
> 			usblp->wcomplete = 1;
> 			if (err != -ENOMEM)
> 				count = -EIO;

Actions: View | Diff

Attachments on bug 236736: 153022 | 155659 | 156865 | 157670 | 157906