[XFS] Fix merge failures

[pandora-kernel.git] / drivers / isdn / mISDN / dsp_pipeline.c

diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index 850260a..5ee6651 100644 (file)
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -249,7 +249,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
                name = strsep(&tok, "(");
                args = strsep(&tok, ")");
                if (args && !*args)
-                       args = 0;
+                       args = NULL;
 
                list_for_each_entry_safe(entry, n, &dsp_elements, list)
                        if (!strcmp(entry->elem->name, name)) {