diff options
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 14 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index fdf70c3d7..cd65bf92b 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -780,17 +780,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); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 1f2fdd4e3..43f531ad0 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-11-27 12:33 hverkuil + + * ../linux/drivers/media/video/saa7115.c: (saa7115_log_status): + - fix VIDIOC_LOG_STATUS message (prints random pointer as string). + + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + 2005-11-27 01:01 mkrufky * ../v4l/Makefile: |