diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-19 09:44:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 09:44:37 +0100 |
| commit | 3ac3ba0b396fd99550e08034b0e4c27fdf39c252 (patch) | |
| tree | f9f69fac41d66540a37a33808714d055d702328f /sound/pci/pcxhr/pcxhr.c | |
| parent | 934352f214b3251eb0793c1209d346595a661d80 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
Diffstat (limited to 'sound/pci/pcxhr/pcxhr.c')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 0e06c6c9fcc..73de6e989b3 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c @@ -1229,8 +1229,11 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id return -ENOMEM; } - if (snd_BUG_ON(pci_id->driver_data >= PCI_ID_LAST)) + if (snd_BUG_ON(pci_id->driver_data >= PCI_ID_LAST)) { + kfree(mgr); + pci_disable_device(pci); return -ENODEV; + } card_name = pcxhr_board_params[pci_id->driver_data].board_name; mgr->playback_chips = pcxhr_board_params[pci_id->driver_data].playback_chips; mgr->capture_chips = pcxhr_board_params[pci_id->driver_data].capture_chips; |