Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[~andy/linux] / drivers / staging / speakup / synth.c

diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index e2d84c090d64f6eefbaa075bd0baac489e679dc1..0b3549bd909d0619a594155f91a3f18372eeb7be 100644 (file)
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -157,7 +157,7 @@ const char *spk_synth_immediate(struct spk_synth *synth, const char *buff)
                        return buff;
                buff++;
        }
-       return 0;
+       return NULL;
 }
 EXPORT_SYMBOL_GPL(spk_synth_immediate);