From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 23 Mar 2009 23:36:13 +0000 (+0100)
Subject: Merge branch 'topic/isa-misc' into for-linus
X-Git-Tag: v2.6.30-rc1~676^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fa15fdeffa3977b17882f485547e65296cf0bd30;p=~emulex%2Finfiniband.git

Merge branch 'topic/isa-misc' into for-linus
---

fa15fdeffa3977b17882f485547e65296cf0bd30
diff --cc sound/isa/opl3sa2.c
index 9c5fce31f06,3f0b877bc8b..ef95279da7a
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@@ -631,14 -631,12 +631,14 @@@ static int snd_opl3sa2_card_new(int dev
  {
  	struct snd_card *card;
  	struct snd_opl3sa2 *chip;
 +	int err;
  
 -	card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_opl3sa2));
 -	if (card == NULL)
 -		return NULL;
 +	err = snd_card_create(index[dev], id[dev], THIS_MODULE,
 +			      sizeof(struct snd_opl3sa2), &card);
 +	if (err < 0)
 +		return err;
  	strcpy(card->driver, "OPL3SA2");
- 	strcpy(card->shortname, "Yamaha OPL3-SA2");
+ 	strcpy(card->shortname, "Yamaha OPL3-SA");
  	chip = card->private_data;
  	spin_lock_init(&chip->reg_lock);
  	chip->irq = -1;