ALSA: hda - Add two more machines to the power_save_blacklist

[sfrench/cifs-2.6.git] / sound / drivers / aloop.c

diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index 1e34e6381baad1f8aec5789418e3aef6207176bd..8c3fbe1276be141c79af15acba98287ac8ebf46b 100644 (file)
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -1133,16 +1133,10 @@ static void print_cable_info(struct snd_info_entry *entry,
 static int loopback_proc_new(struct loopback *loopback, int cidx)
 {
        char name[32];
-       struct snd_info_entry *entry;
-       int err;
 
        snprintf(name, sizeof(name), "cable#%d", cidx);
-       err = snd_card_proc_new(loopback->card, name, &entry);
-       if (err < 0)
-               return err;
-
-       snd_info_set_text_ops(entry, loopback, print_cable_info);
-       return 0;
+       return snd_card_ro_proc_new(loopback->card, name, loopback,
+                                   print_cable_info);
 }
 
 static int loopback_probe(struct platform_device *devptr)
@@ -1200,12 +1194,8 @@ static int loopback_remove(struct platform_device *devptr)
 static int loopback_suspend(struct device *pdev)
 {
        struct snd_card *card = dev_get_drvdata(pdev);
-       struct loopback *loopback = card->private_data;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-
-       snd_pcm_suspend_all(loopback->pcm[0]);
-       snd_pcm_suspend_all(loopback->pcm[1]);
        return 0;
 }