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

Commit 2944275b authored by Rask Ingemann Lambertsen's avatar Rask Ingemann Lambertsen Committed by Jaroslav Kysela
Browse files

[ALSA] ad1816a: Fix modprobe snd_mpu401 && modprobe snd_ad1816a 



   The ad1816a driver fails if the mpu401 driver has been loaded first. This
patch against linux 2.6.20 fixes it by just ignoring the MPU-401 device in
that case, so that the rest of the sound card can be used. The ad1816a
driver already handles the MPU-401 device being unavailable due to lack of
resources in the same way.

Signed-off-by: default avatarRask Ingemann Lambertsen <rask@sygehus.dk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 1b60f6b0

sound/isa/ad1816a/ad1816a.c

+6 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar 
	}

	acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL);

	if (acard->devmpu == NULL) {

		kfree(cfg);

		return -EBUSY;

		mpu_port[dev] = -1;

		snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n");

	}



	pdev = acard->dev;
@@ -162,6 +162,10 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar 
	dma2[dev] = pnp_dma(pdev, 1);

	irq[dev] = pnp_irq(pdev, 0);



	if (acard->devmpu == NULL) {

		kfree(cfg);

		return 0;

	}

	pdev = acard->devmpu;

	pnp_init_resource_table(cfg);