diff options
Diffstat (limited to 'sound/pci/bt87x.c')
| -rw-r--r-- | sound/pci/bt87x.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index c5557eaf3e2e..2236c958aec0 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
| @@ -59,16 +59,6 @@ module_param(load_all, bool, 0444); | |||
| 59 | MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards"); | 59 | MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards"); |
| 60 | 60 | ||
| 61 | 61 | ||
| 62 | #ifndef PCI_VENDOR_ID_BROOKTREE | ||
| 63 | #define PCI_VENDOR_ID_BROOKTREE 0x109e | ||
| 64 | #endif | ||
| 65 | #ifndef PCI_DEVICE_ID_BROOKTREE_878 | ||
| 66 | #define PCI_DEVICE_ID_BROOKTREE_878 0x0878 | ||
| 67 | #endif | ||
| 68 | #ifndef PCI_DEVICE_ID_BROOKTREE_879 | ||
| 69 | #define PCI_DEVICE_ID_BROOKTREE_879 0x0879 | ||
| 70 | #endif | ||
| 71 | |||
| 72 | /* register offsets */ | 62 | /* register offsets */ |
| 73 | #define REG_INT_STAT 0x100 /* interrupt status */ | 63 | #define REG_INT_STAT 0x100 /* interrupt status */ |
| 74 | #define REG_INT_MASK 0x104 /* interrupt mask */ | 64 | #define REG_INT_MASK 0x104 /* interrupt mask */ |
| @@ -720,7 +710,7 @@ static int __devinit snd_bt87x_create(snd_card_t *card, | |||
| 720 | if (err < 0) | 710 | if (err < 0) |
| 721 | return err; | 711 | return err; |
| 722 | 712 | ||
| 723 | chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); | 713 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| 724 | if (!chip) { | 714 | if (!chip) { |
| 725 | pci_disable_device(pci); | 715 | pci_disable_device(pci); |
| 726 | return -ENOMEM; | 716 | return -ENOMEM; |
| @@ -911,6 +901,7 @@ static struct pci_device_id snd_bt87x_default_ids[] = { | |||
| 911 | 901 | ||
| 912 | static struct pci_driver driver = { | 902 | static struct pci_driver driver = { |
| 913 | .name = "Bt87x", | 903 | .name = "Bt87x", |
| 904 | .owner = THIS_MODULE, | ||
| 914 | .id_table = snd_bt87x_ids, | 905 | .id_table = snd_bt87x_ids, |
| 915 | .probe = snd_bt87x_probe, | 906 | .probe = snd_bt87x_probe, |
| 916 | .remove = __devexit_p(snd_bt87x_remove), | 907 | .remove = __devexit_p(snd_bt87x_remove), |
