[PATCH] V4L/dvb: fix kernel message (print of %s from random pointer)

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / media / video / saa7115.c

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index c97fdbd634a4f2ed607b72cf553dd322a295e3ea..e717e30d8187e5cc5927534c147f598589ea1b48 100644 (file)
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -38,7 +38,6 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
-#include <media/i2c-compat.h>
 #include <media/v4l2-common.h>
 
 MODULE_DESCRIPTION("Philips SAA7114/SAA7115 video decoder driver");
@@ -772,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);