Changeset 290 for GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c

Timestamp:

Feb 16, 2008, 7:40:20 AM (17 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.2

File:

• GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c

@@ -486 +486 @@
 
 #ifdef CONFIG_PNP
-        if (isapnp[dev] && (err = snd_cmi8330_pnp(dev, acard, pcard, pid)) < 0) {
+        if (isapnp[dev]) {
+                if ((err = snd_cmi8330_pnp(dev, acard, pcard, pid)) < 0) {
                 snd_printk("PnP detection failed\n");
                 snd_card_free(card);
                 return err;
+        }
+                snd_card_set_dev(card, &pcard->card->dev);
         }
 #endif