From 5950f67f27f8d48c61858a4c191c1fc4123ad71e Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Wed, 23 Sep 2009 18:31:26 -0300 Subject: [PATCH] --- yaml --- r: 173897 b: refs/heads/master c: 798166dbecafa98ec9b28d056774ec2fc80290df h: refs/heads/master i: 173895: 7bd7d3395bd7bc499417b352e80f40a13625827d v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/radio-mr800.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5750e217fb64..1fcecd51882f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16a72f41bb82573d7fe1dfea1cb8356dee307db4 +refs/heads/master: 798166dbecafa98ec9b28d056774ec2fc80290df diff --git a/trunk/drivers/media/radio/radio-mr800.c b/trunk/drivers/media/radio/radio-mr800.c index 5506fac5fd49..4064109c4205 100644 --- a/trunk/drivers/media/radio/radio-mr800.c +++ b/trunk/drivers/media/radio/radio-mr800.c @@ -235,6 +235,7 @@ static int amradio_setfreq(struct amradio_device *radio, int freq) if (retval < 0 || size != BUFFER_LENGTH) goto out_err; + radio->curfreq = freq; goto out; out_err: @@ -371,13 +372,8 @@ static int vidioc_s_frequency(struct file *file, void *priv, struct v4l2_frequency *f) { struct amradio_device *radio = file->private_data; - int retval = 0; - - radio->curfreq = f->frequency; - retval = amradio_setfreq(radio, radio->curfreq); - - return retval; + return amradio_setfreq(radio, f->frequency); } /* vidioc_g_frequency - get tuner radio frequency */