Commit 51828208 authored by Tim Waugh's avatar Tim Waugh Committed by Linus Torvalds

[PATCH] 2.5.6-pre1: parport 'writable' fix

This patch fixes a problem with parport that shows up when interrupts
are specified.  I sent this to Marcelo for 2.4.19-pre2 a short time
ago.

2002-02-25  Tim Waugh  <twaugh@redhat.com>

	* drivers/parport/parport_pc.c: Fix a bug spotted by Mikael
	Pettersson.
	* drivers/parport/ChangeLog: Updated.
parent 48ba6e98
2002-02-25 Tim Waugh <twaugh@redhat.com>
* parport_pc.c: Make sure that priv->ctr_writable includes IntEn
even if IRQ is given as a parameter.
2002-01-21 Tim Waugh <twaugh@redhat.com> 2002-01-21 Tim Waugh <twaugh@redhat.com>
* daisy.c: Apply patch from Max Vorobiev to make parport_daisy_select * daisy.c: Apply patch from Max Vorobiev to make parport_daisy_select
......
...@@ -2136,8 +2136,6 @@ static int __devinit parport_irq_probe(struct parport *pb) ...@@ -2136,8 +2136,6 @@ static int __devinit parport_irq_probe(struct parport *pb)
{ {
struct parport_pc_private *priv = pb->private_data; struct parport_pc_private *priv = pb->private_data;
priv->ctr_writable |= 0x10;
if (priv->ecr) { if (priv->ecr) {
pb->irq = programmable_irq_support(pb); pb->irq = programmable_irq_support(pb);
...@@ -2162,9 +2160,6 @@ static int __devinit parport_irq_probe(struct parport *pb) ...@@ -2162,9 +2160,6 @@ static int __devinit parport_irq_probe(struct parport *pb)
if (pb->irq == PARPORT_IRQ_NONE) if (pb->irq == PARPORT_IRQ_NONE)
pb->irq = get_superio_irq(pb); pb->irq = get_superio_irq(pb);
if (pb->irq == PARPORT_IRQ_NONE)
priv->ctr_writable &= ~0x10;
return pb->irq; return pb->irq;
} }
...@@ -2293,6 +2288,7 @@ struct parport *parport_pc_probe_port (unsigned long int base, ...@@ -2293,6 +2288,7 @@ struct parport *parport_pc_probe_port (unsigned long int base,
} }
if (p->irq != PARPORT_IRQ_NONE) { if (p->irq != PARPORT_IRQ_NONE) {
printk(", irq %d", p->irq); printk(", irq %d", p->irq);
priv->ctr_writable |= 0x10;
if (p->dma == PARPORT_DMA_AUTO) { if (p->dma == PARPORT_DMA_AUTO) {
p->dma = PARPORT_DMA_NONE; p->dma = PARPORT_DMA_NONE;
......
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