diff options
Diffstat (limited to 'sound/pci/ens1370.c')
-rw-r--r-- | sound/pci/ens1370.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index f06b95f41a1d..bef9a59f46d7 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -100,13 +100,6 @@ MODULE_PARM_DESC(joystick, "Enable joystick."); | |||
100 | #endif | 100 | #endif |
101 | #endif /* SUPPORT_JOYSTICK */ | 101 | #endif /* SUPPORT_JOYSTICK */ |
102 | 102 | ||
103 | #ifndef PCI_DEVICE_ID_ENSONIQ_CT5880 | ||
104 | #define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880 | ||
105 | #endif | ||
106 | #ifndef PCI_DEVICE_ID_ENSONIQ_ES1371 | ||
107 | #define PCI_DEVICE_ID_ENSONIQ_ES1371 0x1371 | ||
108 | #endif | ||
109 | |||
110 | /* ES1371 chip ID */ | 103 | /* ES1371 chip ID */ |
111 | /* This is a little confusing because all ES1371 compatible chips have the | 104 | /* This is a little confusing because all ES1371 compatible chips have the |
112 | same DEVICE_ID, the only thing differentiating them is the REV_ID field. | 105 | same DEVICE_ID, the only thing differentiating them is the REV_ID field. |
@@ -1950,7 +1943,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card, | |||
1950 | *rensoniq = NULL; | 1943 | *rensoniq = NULL; |
1951 | if ((err = pci_enable_device(pci)) < 0) | 1944 | if ((err = pci_enable_device(pci)) < 0) |
1952 | return err; | 1945 | return err; |
1953 | ensoniq = kcalloc(1, sizeof(*ensoniq), GFP_KERNEL); | 1946 | ensoniq = kzalloc(sizeof(*ensoniq), GFP_KERNEL); |
1954 | if (ensoniq == NULL) { | 1947 | if (ensoniq == NULL) { |
1955 | pci_disable_device(pci); | 1948 | pci_disable_device(pci); |
1956 | return -ENOMEM; | 1949 | return -ENOMEM; |
@@ -2394,6 +2387,7 @@ static void __devexit snd_audiopci_remove(struct pci_dev *pci) | |||
2394 | 2387 | ||
2395 | static struct pci_driver driver = { | 2388 | static struct pci_driver driver = { |
2396 | .name = DRIVER_NAME, | 2389 | .name = DRIVER_NAME, |
2390 | .owner = THIS_MODULE, | ||
2397 | .id_table = snd_audiopci_ids, | 2391 | .id_table = snd_audiopci_ids, |
2398 | .probe = snd_audiopci_probe, | 2392 | .probe = snd_audiopci_probe, |
2399 | .remove = __devexit_p(snd_audiopci_remove), | 2393 | .remove = __devexit_p(snd_audiopci_remove), |