Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae75784b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

parents 005940ea 7087e295

sound/oss/i810_audio.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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);

		release_mem_region(card->iobase_mmio_phys, 256);

	}

	}

out_pio:	

out_pio:	

	release_region(card->iobase, 64);

out_region2:

	release_region(card->ac97base, 256);

	release_region(card->ac97base, 256);

out_region2:

	release_region(card->iobase, 64);

out_region1:

out_region1:

	pci_free_consistent(pci_dev, sizeof(struct i810_channel)*NR_HW_CH,

	pci_free_consistent(pci_dev, sizeof(struct i810_channel)*NR_HW_CH,

	    card->channel, card->chandma);

	    card->channel, card->chandma);