diff --git a/[refs] b/[refs] index 246e2bdd9f35..9cb33af5d9fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04f141a8800d022981f0405a8d307c98aba55105 +refs/heads/master: 8cb7b63f5baf7b5e788f0d632d5ebd018856416f diff --git a/trunk/sound/sparc/dbri.c b/trunk/sound/sparc/dbri.c index 293108ee7299..2164b7d290c7 100644 --- a/trunk/sound/sparc/dbri.c +++ b/trunk/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 }