From 0975d6d590b954eaad31fde838b3a353f765a275 Mon Sep 17 00:00:00 2001 From: Alexey Klimov Date: Thu, 9 Oct 2008 13:46:59 -0300 Subject: [PATCH] --- yaml --- r: 114079 b: refs/heads/master c: b4be2048ce62d05d93608f82d5e986612ed4fdf7 h: refs/heads/master i: 114077: 0b2274899b15a998fcf59c59891bcab0e0c4e5da 114075: c7ddba358b94edfec22c259df8c5621483ec318c 114071: 8de8568047841265e78279ee692eec0b71046710 114063: b7de3364daf64901b51bc565a6ce9ffe218e7bcc 114047: 61b56eca6124e23be26245aecd6c6dab8097e3b7 v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/radio-zoltrix.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 68c3df8755f3..723d2b802d17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90b698dd47f3929f20746f828e2cd648bc6539dd +refs/heads/master: b4be2048ce62d05d93608f82d5e986612ed4fdf7 diff --git a/trunk/drivers/media/radio/radio-zoltrix.c b/trunk/drivers/media/radio/radio-zoltrix.c index f75da63b1634..15b10bad6796 100644 --- a/trunk/drivers/media/radio/radio-zoltrix.c +++ b/trunk/drivers/media/radio/radio-zoltrix.c @@ -123,8 +123,11 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq) unsigned int stereo = dev->stereo; int i; - if (freq == 0) - return 1; + if (freq == 0) { + printk(KERN_WARNING "zoltrix: received zero freq. Failed to set.\n"); + return -EINVAL; + } + m = (freq / 160 - 8800) * 2; f = (unsigned long long) m + 0x4d1c; @@ -279,7 +282,10 @@ static int vidioc_s_frequency(struct file *file, void *priv, struct zol_device *zol = video_drvdata(file); zol->curfreq = f->frequency; - zol_setfreq(zol, zol->curfreq); + if (zol_setfreq(zol, zol->curfreq) != 0) { + printk(KERN_WARNING "zoltrix: Set frequency failed.\n"); + return -EINVAL; + } return 0; } @@ -343,7 +349,10 @@ static int vidioc_s_ctrl(struct file *file, void *priv, return 0; } zol->stereo = 1; - zol_setfreq(zol, zol->curfreq); + if (zol_setfreq(zol, zol->curfreq) != 0) { + printk(KERN_WARNING "zoltrix: Set frequency failed.\n"); + return -EINVAL; + } #if 0 /* FIXME: Implement stereo/mono switch on V4L2 */ if (v->mode & VIDEO_SOUND_STEREO) {