Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream

[deliverable/linux.git] / sound / sparc / dbri.c

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 012c636019c7078f35c4dccd47721957b3fee7af..2164b7d290c7c0234a30c0b7ebd96ed1547c8908 100644 (file)
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2519,15 +2519,15 @@ static void dbri_debug_read(struct snd_info_entry * entry,
 void snd_dbri_proc(struct snd_dbri * dbri)
 {
        struct snd_info_entry *entry;
-       int err;
 
-       err = snd_card_proc_new(dbri->card, "regs", &entry);
-       snd_info_set_text_ops(entry, dbri, 1024, dbri_regs_read);
+       if (! snd_card_proc_new(dbri->card, "regs", &entry))
+               snd_info_set_text_ops(entry, dbri, 1024, dbri_regs_read);
 
 #ifdef DBRI_DEBUG
-       err = snd_card_proc_new(dbri->card, "debug", &entry);
-       snd_info_set_text_ops(entry, dbri, 4096, dbri_debug_read);
-       entry->mode = S_IFREG | S_IRUGO;        /* Readable only. */
+       if (! snd_card_proc_new(dbri->card, "debug", &entry)) {
+               snd_info_set_text_ops(entry, dbri, 4096, dbri_debug_read);
+               entry->mode = S_IFREG | S_IRUGO;        /* Readable only. */
+       }
 #endif
 }
 
@@ -2664,9 +2664,6 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
        /* /proc file handling */
        snd_dbri_proc(dbri);
 
-       if ((err = snd_card_set_generic_dev(card)) < 0)
-               goto _err;
-
        if ((err = snd_card_register(card)) < 0)
                goto _err;