diff options
| -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); | |||
| 612 | #define MINOR2BRD(min) (((min) & 0xc0) >> 6) | 612 | #define MINOR2BRD(min) (((min) & 0xc0) >> 6) |
| 613 | #define MINOR2PORT(min) ((min) & 0x3f) | 613 | #define MINOR2PORT(min) ((min) & 0x3f) |
| 614 | 614 | ||
| 615 | /* | ||
| 616 | * Define a baud rate table that converts termios baud rate selector | ||
| 617 | * into the actual baud rate value. All baud rate calculations are based | ||
| 618 | * on the actual baud rate required. | ||
| 619 | */ | ||
| 620 | static unsigned int stli_baudrates[] = { | ||
| 621 | 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, | ||
| 622 | 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 | ||
| 623 | }; | ||
| 624 | |||
| 625 | /*****************************************************************************/ | 615 | /*****************************************************************************/ |
| 626 | 616 | ||
| 627 | /* | 617 | /* |
| @@ -2747,15 +2737,7 @@ static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tio | |||
| 2747 | /* | 2737 | /* |
| 2748 | * Start of by setting the baud, char size, parity and stop bit info. | 2738 | * Start of by setting the baud, char size, parity and stop bit info. |
| 2749 | */ | 2739 | */ |
| 2750 | pp->baudout = tiosp->c_cflag & CBAUD; | 2740 | pp->baudout = tty_get_baud_rate(portp->tty); |
| 2751 | if (pp->baudout & CBAUDEX) { | ||
| 2752 | pp->baudout &= ~CBAUDEX; | ||
| 2753 | if ((pp->baudout < 1) || (pp->baudout > 4)) | ||
| 2754 | tiosp->c_cflag &= ~CBAUDEX; | ||
| 2755 | else | ||
| 2756 | pp->baudout += 15; | ||
| 2757 | } | ||
| 2758 | pp->baudout = stli_baudrates[pp->baudout]; | ||
| 2759 | if ((tiosp->c_cflag & CBAUD) == B38400) { | 2741 | if ((tiosp->c_cflag & CBAUD) == B38400) { |
| 2760 | if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) | 2742 | if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) |
| 2761 | pp->baudout = 57600; | 2743 | pp->baudout = 57600; |
