diff options
Diffstat (limited to 'sound/pci/ice1712/ice1724.c')
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index c7af5e5fee13..c3ce8f93740b 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -83,12 +83,6 @@ MODULE_PARM_DESC(enable, "Enable ICE1724 soundcard."); | |||
83 | module_param_array(model, charp, NULL, 0444); | 83 | module_param_array(model, charp, NULL, 0444); |
84 | MODULE_PARM_DESC(model, "Use the given board model."); | 84 | MODULE_PARM_DESC(model, "Use the given board model."); |
85 | 85 | ||
86 | #ifndef PCI_VENDOR_ID_ICE | ||
87 | #define PCI_VENDOR_ID_ICE 0x1412 | ||
88 | #endif | ||
89 | #ifndef PCI_DEVICE_ID_VT1724 | ||
90 | #define PCI_DEVICE_ID_VT1724 0x1724 | ||
91 | #endif | ||
92 | 86 | ||
93 | /* Both VT1720 and VT1724 have the same PCI IDs */ | 87 | /* Both VT1720 and VT1724 have the same PCI IDs */ |
94 | static struct pci_device_id snd_vt1724_ids[] = { | 88 | static struct pci_device_id snd_vt1724_ids[] = { |
@@ -2130,7 +2124,7 @@ static int __devinit snd_vt1724_create(snd_card_t * card, | |||
2130 | if ((err = pci_enable_device(pci)) < 0) | 2124 | if ((err = pci_enable_device(pci)) < 0) |
2131 | return err; | 2125 | return err; |
2132 | 2126 | ||
2133 | ice = kcalloc(1, sizeof(*ice), GFP_KERNEL); | 2127 | ice = kzalloc(sizeof(*ice), GFP_KERNEL); |
2134 | if (ice == NULL) { | 2128 | if (ice == NULL) { |
2135 | pci_disable_device(pci); | 2129 | pci_disable_device(pci); |
2136 | return -ENOMEM; | 2130 | return -ENOMEM; |
@@ -2321,6 +2315,7 @@ static void __devexit snd_vt1724_remove(struct pci_dev *pci) | |||
2321 | 2315 | ||
2322 | static struct pci_driver driver = { | 2316 | static struct pci_driver driver = { |
2323 | .name = "ICE1724", | 2317 | .name = "ICE1724", |
2318 | .owner = THIS_MODULE, | ||
2324 | .id_table = snd_vt1724_ids, | 2319 | .id_table = snd_vt1724_ids, |
2325 | .probe = snd_vt1724_probe, | 2320 | .probe = snd_vt1724_probe, |
2326 | .remove = __devexit_p(snd_vt1724_remove), | 2321 | .remove = __devexit_p(snd_vt1724_remove), |