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

Commit 31390d0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: ASoC: Blackfin: update SPORT0 port selector (v2)
  ALSA: hda - Restore default pin configs for realtek codecs
  sound: use a common working email address
  pci: use pci_ioremap_bar() in sound/
parents 6634160a 0a9b8638

sound/oss/kahlua.c

+1 −1
Original line number Diff line number Diff line 
/*

 *	Initialisation code for Cyrix/NatSemi VSA1 softaudio

 *

 *	(C) Copyright 2003 Red Hat Inc <alan@redhat.com>

 *	(C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>

 *

 * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.

 * The older version (VSA1) provides fairly good soundblaster emulation

sound/pci/ad1889.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ snd_ad1889_create(struct snd_card *card, 
		goto free_and_ret;



	chip->bar = pci_resource_start(pci, 0);

	chip->iobase = ioremap_nocache(chip->bar, pci_resource_len(pci, 0));

	chip->iobase = pci_ioremap_bar(pci, 0);

	if (chip->iobase == NULL) {

		printk(KERN_ERR PFX "unable to reserve region.\n");

		err = -EBUSY;

sound/pci/atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, 
		return err;

	}

	chip->addr = pci_resource_start(pci, 0);

	chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));

	chip->remap_addr = pci_ioremap_bar(pci, 0);

	if (chip->remap_addr == NULL) {

		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");

		snd_atiixp_free(chip);

sound/pci/atiixp_modem.c

+1 −1
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card, 
		return err;

	}

	chip->addr = pci_resource_start(pci, 0);

	chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));

	chip->remap_addr = pci_ioremap_bar(pci, 0);

	if (chip->remap_addr == NULL) {

		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");

		snd_atiixp_free(chip);

sound/pci/au88x0/au88x0.c

+1 −2
Original line number Diff line number Diff line
@@ -180,8 +180,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) 
	if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)

		goto regions_out;



	chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),

	                             pci_resource_len(pci, 0));

	chip->mmio = pci_ioremap_bar(pci, 0);

	if (!chip->mmio) {

		printk(KERN_ERR "MMIO area remap failed.\n");

		err = -ENOMEM;