diff options
Diffstat (limited to 'drivers/media/radio')
-rw-r--r-- | drivers/media/radio/radio-mr800.c | 1 | ||||
-rw-r--r-- | drivers/media/radio/radio-si470x.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index 837467f93805..575bf9d89419 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
@@ -58,6 +58,7 @@ | |||
58 | #include <linux/module.h> | 58 | #include <linux/module.h> |
59 | #include <linux/init.h> | 59 | #include <linux/init.h> |
60 | #include <linux/slab.h> | 60 | #include <linux/slab.h> |
61 | #include <linux/smp_lock.h> | ||
61 | #include <linux/input.h> | 62 | #include <linux/input.h> |
62 | #include <linux/videodev2.h> | 63 | #include <linux/videodev2.h> |
63 | #include <media/v4l2-device.h> | 64 | #include <media/v4l2-device.h> |
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c index 640421ceb24a..e85f318b4d2b 100644 --- a/drivers/media/radio/radio-si470x.c +++ b/drivers/media/radio/radio-si470x.c | |||
@@ -127,6 +127,7 @@ | |||
127 | #include <linux/module.h> | 127 | #include <linux/module.h> |
128 | #include <linux/init.h> | 128 | #include <linux/init.h> |
129 | #include <linux/slab.h> | 129 | #include <linux/slab.h> |
130 | #include <linux/smp_lock.h> | ||
130 | #include <linux/input.h> | 131 | #include <linux/input.h> |
131 | #include <linux/usb.h> | 132 | #include <linux/usb.h> |
132 | #include <linux/hid.h> | 133 | #include <linux/hid.h> |
@@ -1200,7 +1201,7 @@ static int si470x_fops_release(struct file *file) | |||
1200 | video_unregister_device(radio->videodev); | 1201 | video_unregister_device(radio->videodev); |
1201 | kfree(radio->buffer); | 1202 | kfree(radio->buffer); |
1202 | kfree(radio); | 1203 | kfree(radio); |
1203 | goto done; | 1204 | goto unlock; |
1204 | } | 1205 | } |
1205 | 1206 | ||
1206 | /* stop rds reception */ | 1207 | /* stop rds reception */ |
@@ -1213,9 +1214,8 @@ static int si470x_fops_release(struct file *file) | |||
1213 | retval = si470x_stop(radio); | 1214 | retval = si470x_stop(radio); |
1214 | usb_autopm_put_interface(radio->intf); | 1215 | usb_autopm_put_interface(radio->intf); |
1215 | } | 1216 | } |
1216 | 1217 | unlock: | |
1217 | mutex_unlock(&radio->disconnect_lock); | 1218 | mutex_unlock(&radio->disconnect_lock); |
1218 | |||
1219 | done: | 1219 | done: |
1220 | return retval; | 1220 | return retval; |
1221 | } | 1221 | } |