Skip to content

L
linux
Commit bc14d0aa authored by William Stinson's avatar William Stinson Committed by Jeff Garzik
Browse files
Options

Fix rocketport serial driver for kdev_t changes in early 2.5.x series.

parent ec48294e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/char/rocket.c
View file @ bc14d0aa
...@@ -227,7 +227,7 @@ static inline int rocket_paranoia_check(struct r_port *info, ...@@ -227,7 +227,7 @@ static inline int rocket_paranoia_check(struct r_port *info,
if (!info) if (!info)
return 1; return 1;
if (info->magic != RPORT_MAGIC) { if (info->magic != RPORT_MAGIC) {
printk(badmagic, MAJOR(device), MINOR(device), routine); printk(badmagic, major(device), minor(device), routine);
return 1; return 1;
} }
#endif #endif
...@@ -896,7 +896,7 @@ static int rp_open(struct tty_struct *tty, struct file * filp) ...@@ -896,7 +896,7 @@ static int rp_open(struct tty_struct *tty, struct file * filp)
CHANNEL_t *cp; CHANNEL_t *cp;
unsigned long page; unsigned long page;
line = MINOR(tty->device) - tty->driver.minor_start; line = minor(tty->device) - tty->driver.minor_start;
if ((line < 0) || (line >= MAX_RP_PORTS)) if ((line < 0) || (line >= MAX_RP_PORTS))
return -ENODEV; return -ENODEV;
if (!tmp_buf) { if (!tmp_buf) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7