diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2005-12-01 03:51:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:48:59 -0500 |
commit | ab60e303cd3e73a68d5e397be50a1cb35452513c (patch) | |
tree | 220530c188a90ad2f8c08d72ed0b7fea423c6a81 /drivers/media/video | |
parent | 3535396d3ac7fc5eeda4526aee34494a479cc628 (diff) |
[PATCH] V4L/dvb: fix kernel message (print of %s from random pointer)
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/saa7115.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index 0235cef07b31..e717e30d8187 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c | |||
@@ -771,17 +771,19 @@ static v4l2_std_id saa7115_get_v4lstd(struct i2c_client *client) | |||
771 | 771 | ||
772 | static void saa7115_log_status(struct i2c_client *client) | 772 | static void saa7115_log_status(struct i2c_client *client) |
773 | { | 773 | { |
774 | static const char * const audclk_freq_strs[] = { | ||
775 | "44.1 kHz", | ||
776 | "48 kHz", | ||
777 | "32 kHz" | ||
778 | }; | ||
779 | struct saa7115_state *state = i2c_get_clientdata(client); | 774 | struct saa7115_state *state = i2c_get_clientdata(client); |
775 | char *audfreq = "undefined"; | ||
780 | int reg1e, reg1f; | 776 | int reg1e, reg1f; |
781 | int signalOk; | 777 | int signalOk; |
782 | int vcr; | 778 | int vcr; |
783 | 779 | ||
784 | saa7115_info("Audio frequency: %s\n", audclk_freq_strs[state->audclk_freq]); | 780 | switch (state->audclk_freq) { |
781 | case V4L2_AUDCLK_32_KHZ: audfreq = "32 kHz"; break; | ||
782 | case V4L2_AUDCLK_441_KHZ: audfreq = "44.1 kHz"; break; | ||
783 | case V4L2_AUDCLK_48_KHZ: audfreq = "48 kHz"; break; | ||
784 | } | ||
785 | |||
786 | saa7115_info("Audio frequency: %s\n", audfreq); | ||
785 | if (client->name[6] == '4') { | 787 | if (client->name[6] == '4') { |
786 | /* status for the saa7114 */ | 788 | /* status for the saa7114 */ |
787 | reg1f = saa7115_read(client, 0x1f); | 789 | reg1f = saa7115_read(client, 0x1f); |