diff options
Diffstat (limited to 'sound/pci/via82xx_modem.c')
-rw-r--r-- | sound/pci/via82xx_modem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 4a9779cc9733..7eac6f6ac737 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
@@ -521,6 +521,7 @@ static int snd_via82xx_pcm_trigger(snd_pcm_substream_t * substream, int cmd) | |||
521 | 521 | ||
522 | switch (cmd) { | 522 | switch (cmd) { |
523 | case SNDRV_PCM_TRIGGER_START: | 523 | case SNDRV_PCM_TRIGGER_START: |
524 | case SNDRV_PCM_TRIGGER_SUSPEND: | ||
524 | val |= VIA_REG_CTRL_START; | 525 | val |= VIA_REG_CTRL_START; |
525 | viadev->running = 1; | 526 | viadev->running = 1; |
526 | break; | 527 | break; |
@@ -697,7 +698,7 @@ static snd_pcm_hardware_t snd_via82xx_hw = | |||
697 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 698 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | |
698 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 699 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
699 | SNDRV_PCM_INFO_MMAP_VALID | | 700 | SNDRV_PCM_INFO_MMAP_VALID | |
700 | SNDRV_PCM_INFO_RESUME | | 701 | /* SNDRV_PCM_INFO_RESUME | */ |
701 | SNDRV_PCM_INFO_PAUSE), | 702 | SNDRV_PCM_INFO_PAUSE), |
702 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, | 703 | .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, |
703 | .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_KNOT, | 704 | .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_KNOT, |
@@ -1082,7 +1083,7 @@ static int __devinit snd_via82xx_create(snd_card_t * card, | |||
1082 | if ((err = pci_enable_device(pci)) < 0) | 1083 | if ((err = pci_enable_device(pci)) < 0) |
1083 | return err; | 1084 | return err; |
1084 | 1085 | ||
1085 | if ((chip = kcalloc(1, sizeof(*chip), GFP_KERNEL)) == NULL) { | 1086 | if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) { |
1086 | pci_disable_device(pci); | 1087 | pci_disable_device(pci); |
1087 | return -ENOMEM; | 1088 | return -ENOMEM; |
1088 | } | 1089 | } |
@@ -1206,6 +1207,7 @@ static void __devexit snd_via82xx_remove(struct pci_dev *pci) | |||
1206 | 1207 | ||
1207 | static struct pci_driver driver = { | 1208 | static struct pci_driver driver = { |
1208 | .name = "VIA 82xx Modem", | 1209 | .name = "VIA 82xx Modem", |
1210 | .owner = THIS_MODULE, | ||
1209 | .id_table = snd_via82xx_modem_ids, | 1211 | .id_table = snd_via82xx_modem_ids, |
1210 | .probe = snd_via82xx_probe, | 1212 | .probe = snd_via82xx_probe, |
1211 | .remove = __devexit_p(snd_via82xx_remove), | 1213 | .remove = __devexit_p(snd_via82xx_remove), |