git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
radio
/
radio-si470x.c
diff --git
a/drivers/media/radio/radio-si470x.c
b/drivers/media/radio/radio-si470x.c
index
640421c
..
e85f318
100644
(file)
--- a/
drivers/media/radio/radio-si470x.c
+++ b/
drivers/media/radio/radio-si470x.c
@@
-127,6
+127,7
@@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
+#include <linux/smp_lock.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/hid.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/hid.h>
@@
-1200,7
+1201,7
@@
static int si470x_fops_release(struct file *file)
video_unregister_device(radio->videodev);
kfree(radio->buffer);
kfree(radio);
video_unregister_device(radio->videodev);
kfree(radio->buffer);
kfree(radio);
- goto
done
;
+ goto
unlock
;
}
/* stop rds reception */
}
/* stop rds reception */
@@
-1213,9
+1214,8
@@
static int si470x_fops_release(struct file *file)
retval = si470x_stop(radio);
usb_autopm_put_interface(radio->intf);
}
retval = si470x_stop(radio);
usb_autopm_put_interface(radio->intf);
}
-
+unlock:
mutex_unlock(&radio->disconnect_lock);
mutex_unlock(&radio->disconnect_lock);
-
done:
return retval;
}
done:
return retval;
}