Skip to content

L
linux
Commit ef27791d authored by Linus Torvalds's avatar Linus Torvalds Committed by Linus Torvalds
Browse files
Options

Remove unnecessary (and now nonworking) "sti()" in parport 

interrupt probing
parent e5066df3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
drivers/parport/parport_pc.c
View file @ ef27791d
...@@ -2058,7 +2058,6 @@ static int __devinit irq_probe_ECP(struct parport *pb) ...@@ -2058,7 +2058,6 @@ static int __devinit irq_probe_ECP(struct parport *pb)
int i; int i;
unsigned long irqs; unsigned long irqs;
sti();
irqs = probe_irq_on(); irqs = probe_irq_on();
ECR_WRITE (pb, ECR_SPP << 5); /* Reset FIFO */ ECR_WRITE (pb, ECR_SPP << 5); /* Reset FIFO */
...@@ -2093,7 +2092,6 @@ static int __devinit irq_probe_EPP(struct parport *pb) ...@@ -2093,7 +2092,6 @@ static int __devinit irq_probe_EPP(struct parport *pb)
if (pb->modes & PARPORT_MODE_PCECR) if (pb->modes & PARPORT_MODE_PCECR)
oecr = inb (ECONTROL (pb)); oecr = inb (ECONTROL (pb));
sti();
irqs = probe_irq_on(); irqs = probe_irq_on();
if (pb->modes & PARPORT_MODE_PCECR) if (pb->modes & PARPORT_MODE_PCECR)
......
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