]> err.no Git - linux-2.6/commitdiff
[PATCH] V4L/dvb: fix kernel message (print of %s from random pointer)
authorHans Verkuil <hverkuil@xs4all.nl>
Thu, 1 Dec 2005 08:51:58 +0000 (00:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:48:59 +0000 (15:48 -0800)
Fix kernel message ( basically printk("%s", random_pointer) ).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/video/saa7115.c

index 0235cef07b310a59f1cd0d482daeaed3c56d33f6..e717e30d8187e5cc5927534c147f598589ea1b48 100644 (file)
@@ -771,17 +771,19 @@ static v4l2_std_id saa7115_get_v4lstd(struct i2c_client *client)
 
 static void saa7115_log_status(struct i2c_client *client)
 {
-       static const char * const audclk_freq_strs[] = {
-               "44.1 kHz",
-               "48 kHz",
-               "32 kHz"
-       };
        struct saa7115_state *state = i2c_get_clientdata(client);
+       char *audfreq = "undefined";
        int reg1e, reg1f;
        int signalOk;
        int vcr;
 
-       saa7115_info("Audio frequency: %s\n", audclk_freq_strs[state->audclk_freq]);
+       switch (state->audclk_freq) {
+               case V4L2_AUDCLK_32_KHZ:  audfreq = "32 kHz"; break;
+               case V4L2_AUDCLK_441_KHZ: audfreq = "44.1 kHz"; break;
+               case V4L2_AUDCLK_48_KHZ:  audfreq = "48 kHz"; break;
+       }
+
+       saa7115_info("Audio frequency: %s\n", audfreq);
        if (client->name[6] == '4') {
                /* status for the saa7114 */
                reg1f = saa7115_read(client, 0x1f);