Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54655
b: refs/heads/master
c: b259d74
h: refs/heads/master
i:
  54653: 616ff36
  54651: d431ddf
  54647: 3e9c99d
  54639: b543c73
  54623: 7968207
  54591: 6aa9cac
  54527: 5639192
v: v3
  • Loading branch information
Milind Arun Choudhary authored and Linus Torvalds committed May 8, 2007
1 parent 4cc9692 commit 96fa050
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 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: 0e8638e2ace18eb6b814a63fe087106be05ca267
refs/heads/master: b259d74b39595f6ac74c3627b9c3657ac90249a0
5 changes: 1 addition & 4 deletions trunk/drivers/char/lp.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@
/* if you have more than 8 printers, remember to increase LP_NO */
#define LP_NO 8

/* ROUND_UP macro from fs/select.c */
#define ROUND_UP(x,y) (((x)+(y)-1)/(y))

static struct lp_struct lp_table[LP_NO];

static unsigned int lp_count = 0;
Expand Down Expand Up @@ -651,7 +648,7 @@ static int lp_ioctl(struct inode *inode, struct file *file,
(par_timeout.tv_usec < 0)) {
return -EINVAL;
}
to_jiffies = ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
to_jiffies = DIV_ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
to_jiffies += par_timeout.tv_sec * (long) HZ;
if (to_jiffies <= 0) {
return -EINVAL;
Expand Down

0 comments on commit 96fa050

Please sign in to comment.