Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
This commit is contained in:
commit
ae75784bc5
1 changed files with 2 additions and 2 deletions
|
@ -3430,9 +3430,9 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
|
|||
release_mem_region(card->iobase_mmio_phys, 256);
|
||||
}
|
||||
out_pio:
|
||||
release_region(card->iobase, 64);
|
||||
out_region2:
|
||||
release_region(card->ac97base, 256);
|
||||
out_region2:
|
||||
release_region(card->iobase, 64);
|
||||
out_region1:
|
||||
pci_free_consistent(pci_dev, sizeof(struct i810_channel)*NR_HW_CH,
|
||||
card->channel, card->chandma);
|
||||
|
|
Loading…
Reference in a new issue