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

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

diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c
index a965378a767eef254a96148ff8e4d2c7311e98a9..1feb0fba1b436bbe13ee619c296f434895c7dda6 100644 (file)
--- a/drivers/staging/speakup/speakup_dtlk.c
+++ b/drivers/staging/speakup/speakup_dtlk.c
@@ -254,7 +254,7 @@ static const char *synth_immediate(struct spk_synth *synth, const char *buf)
                spk_out(ch);
                buf++;
        }
-       return 0;
+       return NULL;
 }
 
 static void synth_flush(struct spk_synth *synth)