diff options
Diffstat (limited to 'drivers/serial/serial_cs.c')
| -rw-r--r-- | drivers/serial/serial_cs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 9597442a0ac1..0460c0882b70 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
| @@ -183,10 +183,8 @@ static void quirk_config_socket(struct pcmcia_device *link) | |||
| 183 | { | 183 | { |
| 184 | struct serial_info *info = link->priv; | 184 | struct serial_info *info = link->priv; |
| 185 | 185 | ||
| 186 | if (info->multi) { | 186 | if (info->multi) |
| 187 | link->conf.Present |= PRESENT_EXT_STATUS; | 187 | link->conf.Attributes |= CONF_ENABLE_ESR; |
| 188 | link->conf.ExtStatus = ESR_REQ_ATTN_ENA; | ||
| 189 | } | ||
| 190 | } | 188 | } |
| 191 | 189 | ||
| 192 | static const struct serial_quirk quirks[] = { | 190 | static const struct serial_quirk quirks[] = { |
| @@ -336,10 +334,9 @@ static int serial_probe(struct pcmcia_device *link) | |||
| 336 | link->priv = info; | 334 | link->priv = info; |
| 337 | 335 | ||
| 338 | link->conf.Attributes = CONF_ENABLE_IRQ; | 336 | link->conf.Attributes = CONF_ENABLE_IRQ; |
| 339 | if (do_sound) { | 337 | if (do_sound) |
| 340 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 338 | link->conf.Attributes |= CONF_ENABLE_SPKR; |
| 341 | link->conf.Status = CCSR_AUDIO_ENA; | 339 | |
| 342 | } | ||
| 343 | link->conf.IntType = INT_MEMORY_AND_IO; | 340 | link->conf.IntType = INT_MEMORY_AND_IO; |
| 344 | 341 | ||
| 345 | return serial_config(link); | 342 | return serial_config(link); |
