diff options
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index c7a370d4f923..dc87e0144b5a 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -57,17 +57,6 @@ module_param_array(dual_codec, bool, NULL, 0444); | |||
| 57 | MODULE_PARM_DESC(dual_codec, "Secondary Codec ID (0 = disabled)."); | 57 | MODULE_PARM_DESC(dual_codec, "Secondary Codec ID (0 = disabled)."); |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * | ||
| 61 | */ | ||
| 62 | |||
| 63 | #ifndef PCI_VENDOR_ID_CIRRUS | ||
| 64 | #define PCI_VENDOR_ID_CIRRUS 0x1013 | ||
| 65 | #endif | ||
| 66 | #ifndef PCI_DEVICE_ID_CIRRUS_4281 | ||
| 67 | #define PCI_DEVICE_ID_CIRRUS_4281 0x6005 | ||
| 68 | #endif | ||
| 69 | |||
| 70 | /* | ||
| 71 | * Direct registers | 60 | * Direct registers |
| 72 | */ | 61 | */ |
| 73 | 62 | ||
| @@ -1394,7 +1383,7 @@ static int __devinit snd_cs4281_create(snd_card_t * card, | |||
| 1394 | *rchip = NULL; | 1383 | *rchip = NULL; |
| 1395 | if ((err = pci_enable_device(pci)) < 0) | 1384 | if ((err = pci_enable_device(pci)) < 0) |
| 1396 | return err; | 1385 | return err; |
| 1397 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1386 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 1398 | if (chip == NULL) { | 1387 | if (chip == NULL) { |
| 1399 | pci_disable_device(pci); | 1388 | pci_disable_device(pci); |
| 1400 | return -ENOMEM; | 1389 | return -ENOMEM; |
| @@ -2119,6 +2108,7 @@ static int cs4281_resume(snd_card_t *card) | |||
| 2119 | 2108 | ||
| 2120 | static struct pci_driver driver = { | 2109 | static struct pci_driver driver = { |
| 2121 | .name = "CS4281", | 2110 | .name = "CS4281", |
| 2111 | .owner = THIS_MODULE, | ||
| 2122 | .id_table = snd_cs4281_ids, | 2112 | .id_table = snd_cs4281_ids, |
| 2123 | .probe = snd_cs4281_probe, | 2113 | .probe = snd_cs4281_probe, |
| 2124 | .remove = __devexit_p(snd_cs4281_remove), | 2114 | .remove = __devexit_p(snd_cs4281_remove), |
