]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (10317): radio-mr800: fix radio->muted and radio->stereo
authorAlexey Klimov <klimov.linux@gmail.com>
Sun, 25 Jan 2009 23:07:28 +0000 (20:07 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 29 Jan 2009 11:00:40 +0000 (09:00 -0200)
Move radio->muted and radio->stereo in section where radio mutex is
locked to avoid possible race condition problems or access to memory.
Thanks to David Ellingsworth <david@identd.dyndns.org> for pointing to
this weak place in driver.

Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/radio/radio-mr800.c

index 0747dc8862b095718e3dba02bd32be898227f829..fdfc7bf86b9e15c498ea4fc57eef55f304e6f67c 100644 (file)
@@ -194,10 +194,10 @@ static int amradio_start(struct amradio_device *radio)
                return retval;
        }
 
-       mutex_unlock(&radio->lock);
-
        radio->muted = 0;
 
+       mutex_unlock(&radio->lock);
+
        return retval;
 }
 
@@ -230,10 +230,10 @@ static int amradio_stop(struct amradio_device *radio)
                return retval;
        }
 
-       mutex_unlock(&radio->lock);
-
        radio->muted = 1;
 
+       mutex_unlock(&radio->lock);
+
        return retval;
 }
 
@@ -284,10 +284,10 @@ static int amradio_setfreq(struct amradio_device *radio, int freq)
                return retval;
        }
 
-       mutex_unlock(&radio->lock);
-
        radio->stereo = 0;
 
+       mutex_unlock(&radio->lock);
+
        return retval;
 }