diff options
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index b97f50d10ba3..a6d98013c331 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -100,12 +100,6 @@ MODULE_PARM_DESC(cs8427_timeout, "Define reset timeout for cs8427 chip in msec r | |||
100 | module_param_array(model, charp, NULL, 0444); | 100 | module_param_array(model, charp, NULL, 0444); |
101 | MODULE_PARM_DESC(model, "Use the given board model."); | 101 | MODULE_PARM_DESC(model, "Use the given board model."); |
102 | 102 | ||
103 | #ifndef PCI_VENDOR_ID_ICE | ||
104 | #define PCI_VENDOR_ID_ICE 0x1412 | ||
105 | #endif | ||
106 | #ifndef PCI_DEVICE_ID_ICE_1712 | ||
107 | #define PCI_DEVICE_ID_ICE_1712 0x1712 | ||
108 | #endif | ||
109 | 103 | ||
110 | static struct pci_device_id snd_ice1712_ids[] = { | 104 | static struct pci_device_id snd_ice1712_ids[] = { |
111 | { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */ | 105 | { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */ |
@@ -2535,7 +2529,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card, | |||
2535 | return -ENXIO; | 2529 | return -ENXIO; |
2536 | } | 2530 | } |
2537 | 2531 | ||
2538 | ice = kcalloc(1, sizeof(*ice), GFP_KERNEL); | 2532 | ice = kzalloc(sizeof(*ice), GFP_KERNEL); |
2539 | if (ice == NULL) { | 2533 | if (ice == NULL) { |
2540 | pci_disable_device(pci); | 2534 | pci_disable_device(pci); |
2541 | return -ENOMEM; | 2535 | return -ENOMEM; |
@@ -2741,6 +2735,7 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci) | |||
2741 | 2735 | ||
2742 | static struct pci_driver driver = { | 2736 | static struct pci_driver driver = { |
2743 | .name = "ICE1712", | 2737 | .name = "ICE1712", |
2738 | .owner = THIS_MODULE, | ||
2744 | .id_table = snd_ice1712_ids, | 2739 | .id_table = snd_ice1712_ids, |
2745 | .probe = snd_ice1712_probe, | 2740 | .probe = snd_ice1712_probe, |
2746 | .remove = __devexit_p(snd_ice1712_remove), | 2741 | .remove = __devexit_p(snd_ice1712_remove), |