Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47525
b: refs/heads/master
c: 30a063a
h: refs/heads/master
i:
  47523: a1fc444
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Feb 11, 2007
1 parent 01e46e4 commit 07f473d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition 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: c76b09301eeb844036f17d008e15ff6532d8f33a
refs/heads/master: 30a063a900518926966f4d75333c1bfbde1658fa
4 changes: 0 additions & 4 deletions trunk/drivers/char/mxser_new.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ static int mxvar_diagflag;
static unsigned char mxser_msr[MXSER_PORTS + 1];
static struct mxser_mon_ext mon_data_ext;
static int mxser_set_baud_method[MXSER_PORTS + 1];
static spinlock_t gm_lock;

#ifdef CONFIG_PCI
static int __devinit CheckIsMoxaMust(int io)
Expand Down Expand Up @@ -1377,15 +1376,13 @@ static int __init mxser_program_mode(int port)
{
int id, i, j, n;

spin_lock(&gm_lock);
outb(0, port);
outb(0, port);
outb(0, port);
(void)inb(port);
(void)inb(port);
outb(0, port);
(void)inb(port);
spin_unlock(&gm_lock);

id = inb(port + 1) & 0x1F;
if ((id != C168_ASIC_ID) &&
Expand Down Expand Up @@ -2684,7 +2681,6 @@ static int __init mxser_module_init(void)
mxvar_sdriver = alloc_tty_driver(MXSER_PORTS + 1);
if (!mxvar_sdriver)
return -ENOMEM;
spin_lock_init(&gm_lock);

printk(KERN_INFO "MOXA Smartio/Industio family driver version %s\n",
MXSER_VERSION);
Expand Down

0 comments on commit 07f473d

Please sign in to comment.