diff --git a/[refs] b/[refs] index 69d00eb87c23..249288941edc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ca21611b668eee9ac07bb85825ce30002976550 +refs/heads/master: a76af199dc025e8f5cf6b9542efadc3de5163a7a diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c index 98877030d579..34195b748608 100644 --- a/trunk/sound/arm/aaci.c +++ b/trunk/sound/arm/aaci.c @@ -900,6 +900,8 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id) if (ret) goto out; + snd_card_set_dev(aaci->card, &dev->dev); + ret = snd_card_register(aaci->card); if (ret == 0) { dev_info(&dev->dev, "%s, fifo %d\n", aaci->card->longname, diff --git a/trunk/sound/parisc/harmony.c b/trunk/sound/parisc/harmony.c index d7a8f9f5896f..f560dd8cdb90 100644 --- a/trunk/sound/parisc/harmony.c +++ b/trunk/sound/parisc/harmony.c @@ -880,6 +880,8 @@ snd_harmony_create(snd_card_t *card, goto free_and_ret; } + snd_card_set_dev(card, &padev->dev); + *rchip = h; return 0;