ALSA: pcm: Avoid "BUG:" string for warnings again
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Mar 2016 19:56:20 +0000 (20:56 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Mar 2016 20:00:17 +0000 (21:00 +0100)
The commit [d507941beb1e: ALSA: pcm: Correct PCM BUG error message]
made the warning prefix back to "BUG:" due to its previous wrong
prefix.  But a kernel message containing "BUG:" seems taken as an Oops
message wrongly by some brain-dead daemons, and it annoys users in the
end.  Instead of teaching daemons, change the string again to a more
reasonable one.

Fixes: 507941beb1e ('ALSA: pcm: Correct PCM BUG error message')
Cc: <stable@vger.kernel.org> # v3.19+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/pcm_lib.c

index 6b5a811e01a544f3379829b8ebfa3773904691bb..3a9b66c6e09c38933b63a4af6ee20e34efa09118 100644 (file)
@@ -322,7 +322,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
                        char name[16];
                        snd_pcm_debug_name(substream, name, sizeof(name));
                        pcm_err(substream->pcm,
-                               "BUG: %s, pos = %ld, buffer size = %ld, period size = %ld\n",
+                               "invalid position: %s, pos = %ld, buffer size = %ld, period size = %ld\n",
                                name, pos, runtime->buffer_size,
                                runtime->period_size);
                }