diff options
Diffstat (limited to 'sound/pci/es1938.c')
-rw-r--r-- | sound/pci/es1938.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index b492777bc30f..17fa80c23870 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -76,13 +76,6 @@ MODULE_SUPPORTED_DEVICE("{{ESS,ES1938}," | |||
76 | #define SUPPORT_JOYSTICK 1 | 76 | #define SUPPORT_JOYSTICK 1 |
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | #ifndef PCI_VENDOR_ID_ESS | ||
80 | #define PCI_VENDOR_ID_ESS 0x125d | ||
81 | #endif | ||
82 | #ifndef PCI_DEVICE_ID_ESS_ES1938 | ||
83 | #define PCI_DEVICE_ID_ESS_ES1938 0x1969 | ||
84 | #endif | ||
85 | |||
86 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 79 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
87 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ | 80 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ |
88 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ | 81 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ |
@@ -1501,7 +1494,7 @@ static int __devinit snd_es1938_create(snd_card_t * card, | |||
1501 | return -ENXIO; | 1494 | return -ENXIO; |
1502 | } | 1495 | } |
1503 | 1496 | ||
1504 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 1497 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
1505 | if (chip == NULL) { | 1498 | if (chip == NULL) { |
1506 | pci_disable_device(pci); | 1499 | pci_disable_device(pci); |
1507 | return -ENOMEM; | 1500 | return -ENOMEM; |
@@ -1753,6 +1746,7 @@ static void __devexit snd_es1938_remove(struct pci_dev *pci) | |||
1753 | 1746 | ||
1754 | static struct pci_driver driver = { | 1747 | static struct pci_driver driver = { |
1755 | .name = "ESS ES1938 (Solo-1)", | 1748 | .name = "ESS ES1938 (Solo-1)", |
1749 | .owner = THIS_MODULE, | ||
1756 | .id_table = snd_es1938_ids, | 1750 | .id_table = snd_es1938_ids, |
1757 | .probe = snd_es1938_probe, | 1751 | .probe = snd_es1938_probe, |
1758 | .remove = __devexit_p(snd_es1938_remove), | 1752 | .remove = __devexit_p(snd_es1938_remove), |