aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ipack/devices/ipoctal.c
diff options
context:
space:
mode:
authorSamuel Iglesias Gonsalvez <siglesias@igalia.com>2012-12-10 05:50:03 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-15 21:24:38 -0500
commita3882b7814fb3a5b7ea211e421451b1c4685f8f9 (patch)
tree25d99a83388db3fed0a35b8ae84849f31e416296 /drivers/ipack/devices/ipoctal.c
parent9d01b6f064c130028be8beb729ada7c39021b582 (diff)
ipack/devices/ipoctal: avoid re-enable RX two times.
RX is enabled when the tty port is open, so no need to do it in initialization time: it can allow the device to receive characters but no TTY client is listening to them. It produced an infinite number of IRQ as RxFIFO is not read to clear that IRQ in the device, so it is still pending. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ipack/devices/ipoctal.c')
-rw-r--r--drivers/ipack/devices/ipoctal.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
index f2875f0f14d4..09e3a8e63e22 100644
--- a/drivers/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
@@ -60,6 +60,10 @@ static int ipoctal_port_activate(struct tty_port *port, struct tty_struct *tty)
60 60
61 channel = dev_get_drvdata(tty->dev); 61 channel = dev_get_drvdata(tty->dev);
62 62
63 /*
64 * Enable RX. TX will be enabled when
65 * there is something to send
66 */
63 iowrite8(CR_ENABLE_RX, &channel->regs->w.cr); 67 iowrite8(CR_ENABLE_RX, &channel->regs->w.cr);
64 return 0; 68 return 0;
65} 69}
@@ -385,12 +389,6 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
385 continue; 389 continue;
386 } 390 }
387 dev_set_drvdata(tty_dev, channel); 391 dev_set_drvdata(tty_dev, channel);
388
389 /*
390 * Enable again the RX. TX will be enabled when
391 * there is something to send
392 */
393 iowrite8(CR_ENABLE_RX, &channel->regs->w.cr);
394 } 392 }
395 393
396 return 0; 394 return 0;