Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7949
b: refs/heads/master
c: 0bc8e00
h: refs/heads/master
i:
  7947: baebb67
v: v3
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Sep 8, 2005
1 parent 64c1c49 commit c34b2fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1cf96efbabac2f8af6f75286ffcefd40b0a466c
refs/heads/master: 0bc8e009a2d5106183ea31a2b83035e790778cab
9 changes: 6 additions & 3 deletions trunk/drivers/usb/class/usblp.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,9 @@ static int usblp_check_status(struct usblp *usblp, int err)

error = usblp_read_status (usblp, usblp->statusbuf);
if (error < 0) {
err("usblp%d: error %d reading printer status",
usblp->minor, error);
if (printk_ratelimit())
err("usblp%d: error %d reading printer status",
usblp->minor, error);
return 0;
}

Expand Down Expand Up @@ -604,7 +605,9 @@ static int usblp_ioctl(struct inode *inode, struct file *file, unsigned int cmd,

case LPGETSTATUS:
if (usblp_read_status(usblp, usblp->statusbuf)) {
err("usblp%d: failed reading printer status", usblp->minor);
if (printk_ratelimit())
err("usblp%d: failed reading printer status",
usblp->minor);
retval = -EIO;
goto done;
}
Expand Down

0 comments on commit c34b2fc

Please sign in to comment.