diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-09-29 02:01:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 09:18:24 -0700 |
| commit | 1db27c11e9a0c6d659040ac0b7c64a339e248fa1 (patch) | |
| tree | 213dc86e25d734ab59ddf0f2074c1317b28e3f28 /drivers/char/istallion.c | |
| parent | d720bc4b8fc5d6d179ef094908d4fbb5e436ffad (diff) | |
| download | linux-1db27c11e9a0c6d659040ac0b7c64a339e248fa1.tar.gz linux-1db27c11e9a0c6d659040ac0b7c64a339e248fa1.tar.bz2 linux-1db27c11e9a0c6d659040ac0b7c64a339e248fa1.zip | |
[PATCH] istallion: Remove private baud rate decoding, which is also broken in this case on some platforms
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/istallion.c')
| -rw-r--r-- | drivers/char/istallion.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 8c09997cc3d6..6b4d82a4565f 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c @@ -612,16 +612,6 @@ MODULE_DEVICE_TABLE(pci, istallion_pci_tbl); #define MINOR2BRD(min) (((min) & 0xc0) >> 6) #define MINOR2PORT(min) ((min) & 0x3f) -/* - * Define a baud rate table that converts termios baud rate selector - * into the actual baud rate value. All baud rate calculations are based - * on the actual baud rate required. - */ -static unsigned int stli_baudrates[] = { - 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, - 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 -}; - /*****************************************************************************/ /* @@ -2747,15 +2737,7 @@ static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tio /* * Start of by setting the baud, char size, parity and stop bit info. */ - pp->baudout = tiosp->c_cflag & CBAUD; - if (pp->baudout & CBAUDEX) { - pp->baudout &= ~CBAUDEX; - if ((pp->baudout < 1) || (pp->baudout > 4)) - tiosp->c_cflag &= ~CBAUDEX; - else - pp->baudout += 15; - } - pp->baudout = stli_baudrates[pp->baudout]; + pp->baudout = tty_get_baud_rate(portp->tty); if ((tiosp->c_cflag & CBAUD) == B38400) { if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) pp->baudout = 57600; |