Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 251237 | Differences between
and this patch

Collapse All | Expand All

(-)linux-2.6.27.8/drivers/usb/class/usblp.c (+20 lines)
Lines 259-267 static int usblp_ctrl_msg(struct usblp * Link Here
259
	  index = (usblp->ifnum<<8)|usblp->protocol[usblp->current_protocol].alt_setting;
259
	  index = (usblp->ifnum<<8)|usblp->protocol[usblp->current_protocol].alt_setting;
260
	}
260
	}
261
261
262
	printk(KERN_INFO "usblp%d: in usblp_ctrl_msg: executing usb_control_msg\n",
263
		usblp->minor);
262
	retval = usb_control_msg(usblp->dev,
264
	retval = usb_control_msg(usblp->dev,
263
		dir ? usb_rcvctrlpipe(usblp->dev, 0) : usb_sndctrlpipe(usblp->dev, 0),
265
		dir ? usb_rcvctrlpipe(usblp->dev, 0) : usb_sndctrlpipe(usblp->dev, 0),
264
		request, type | dir | recip, value, index, buf, len, USBLP_CTL_TIMEOUT);
266
		request, type | dir | recip, value, index, buf, len, USBLP_CTL_TIMEOUT);
267
	printk(KERN_INFO "usblp%d: in usblp_ctrl_msg: finished executing usb_control_msg\n",
268
		usblp->minor);
265
	dbg("usblp_control_msg: rq: 0x%02x dir: %d recip: %d value: %d idx: %d len: %#x result: %d",
269
	dbg("usblp_control_msg: rq: 0x%02x dir: %d recip: %d value: %d idx: %d len: %#x result: %d",
266
		request, !!dir, recip, value, index, len, retval);
270
		request, !!dir, recip, value, index, len, retval);
267
	return retval < 0 ? retval : 0;
271
	return retval < 0 ? retval : 0;
Lines 346-353 static int usblp_check_status(struct usb Link Here
346
	unsigned char status, newerr = 0;
350
	unsigned char status, newerr = 0;
347
	int error;
351
	int error;
348
352
353
	printk(KERN_INFO "usblp%d: in usblp_check_status: executing mutex_lock\n",
354
		usblp->minor);
349
	mutex_lock(&usblp->mut);
355
	mutex_lock(&usblp->mut);
356
	printk(KERN_INFO "usblp%d: in usblp_check_status: executing usblp_read_status\n",
357
		usblp->minor);
350
	if ((error = usblp_read_status(usblp, usblp->statusbuf)) < 0) {
358
	if ((error = usblp_read_status(usblp, usblp->statusbuf)) < 0) {
359
	printk(KERN_INFO "usblp%d: in usblp_check_status: executing mutex_unlock\n",
360
		usblp->minor);
351
		mutex_unlock(&usblp->mut);
361
		mutex_unlock(&usblp->mut);
352
		if (printk_ratelimit())
362
		if (printk_ratelimit())
353
			printk(KERN_ERR
363
			printk(KERN_ERR
Lines 658-664 static long usblp_ioctl(struct file *fil Link Here
658
		switch (cmd) {
668
		switch (cmd) {
659
669
660
			case LPGETSTATUS:
670
			case LPGETSTATUS:
671
				printk(KERN_INFO "usblp%d: in usblp_ioctl: executing usblp_read_status\n",
672
					usblp->minor);
661
				if ((retval = usblp_read_status(usblp, usblp->statusbuf))) {
673
				if ((retval = usblp_read_status(usblp, usblp->statusbuf))) {
674
				printk(KERN_INFO "usblp%d: in usblp_ioctl: finished executing usblp_read_status\n",
675
					usblp->minor);
662
					if (printk_ratelimit())
676
					if (printk_ratelimit())
663
						printk(KERN_ERR "usblp%d:"
677
						printk(KERN_ERR "usblp%d:"
664
						    "failed reading printer status (%d)\n",
678
						    "failed reading printer status (%d)\n",
Lines 862-867 done: Link Here
862
 */
876
 */
863
static int usblp_wwait(struct usblp *usblp, int nonblock)
877
static int usblp_wwait(struct usblp *usblp, int nonblock)
864
{
878
{
879
	printk(KERN_INFO "usblp%d: in usblp_wwait: starting execution of code\n",
880
		usblp->minor);
865
	DECLARE_WAITQUEUE(waita, current);
881
	DECLARE_WAITQUEUE(waita, current);
866
	int rc;
882
	int rc;
867
	int err = 0;
883
	int err = 0;
Lines 880-886 static int usblp_wwait(struct usblp *usb Link Here
880
896
881
		if (usblp->flags & LP_ABORT) {
897
		if (usblp->flags & LP_ABORT) {
882
			if (schedule_timeout(msecs_to_jiffies(5000)) == 0) {
898
			if (schedule_timeout(msecs_to_jiffies(5000)) == 0) {
899
				printk(KERN_INFO "usblp%d: in usblp_wwait: executing usblp_check_status\n",
900
					usblp->minor);
883
				err = usblp_check_status(usblp, err);
901
				err = usblp_check_status(usblp, err);
902
				printk(KERN_INFO "usblp%d: in usblp_wwait: finish executing usblp_check_status\n",
903
					usblp->minor);
884
				if (err == 1) {	/* Paper out */
904
				if (err == 1) {	/* Paper out */
885
					rc = -ENOSPC;
905
					rc = -ENOSPC;
886
					break;
906
					break;

Return to bug 251237