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

Commit 7d489c46 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus 

* fix/misc:
  ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
parents 0baddbc8 c2a30d71

sound/isa/cmi8330.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, 
		return -EBUSY;



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

	if (acard->play == NULL)

	if (acard->mpu == NULL)

		return -EBUSY;



	pdev = acard->cap;