[PATCH 2.5.56] Sound core not compiling without /proc support

From: Paul Rolland (rol@witbe.net)
Date: Sun Jan 12 2003 - 07:00:40 EST


Hello,

Here is a quick patch to allow sound support to compile correctly
when not using /proc support.

Regards,
Paul Rolland, rol@as2917.net

15 [12:53] rol@donald:/kernels> diff -uN linux-2.5.56/sound/core/init.c
linux-2.5.56-work/sound/core/init.c
--- linux-2.5.56/sound/core/init.c 2003-01-10 21:11:28.000000000
+0100
+++ linux-2.5.56-work/sound/core/init.c 2003-01-12 12:52:13.000000000
+0100
@@ -115,16 +115,20 @@
                snd_printd("unable to register control minors\n");
                goto __error;
        }
+#ifdef CONFIG_PROC_FS
        if ((err = snd_info_card_create(card)) < 0) {
                snd_printd("unable to create card info\n");
                goto __error_ctl;
        }
+#endif
        if (extra_size > 0)
                card->private_data = (char *)card + sizeof(snd_card_t);
        return card;
 
+#ifdef CONFIG_PROC_FS
       __error_ctl:
        snd_ctl_unregister(card);
+#endif
       __error:
        kfree(card);
        return NULL;
@@ -273,10 +277,12 @@
        if (card->private_free)
                card->private_free(card);
        snd_info_free_entry(card->proc_id);
+#ifdef CONFIG_PROC_FS
        if (snd_info_card_free(card) < 0) {
                snd_printk(KERN_WARNING "unable to free card info\n");
                /* Not fatal error */
        }
+#endif
        while (card->s_f_ops) {
                s_f_ops = card->s_f_ops;
                card->s_f_ops = s_f_ops->next;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Jan 15 2003 - 22:00:40 EST