Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
platform
/
am437x
/
am437x-vpfe.c
diff --git
a/kernel/drivers/media/platform/am437x/am437x-vpfe.c
b/kernel/drivers/media/platform/am437x/am437x-vpfe.c
index
a30cc2f
..
ddf59ee
100644
(file)
--- a/
kernel/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/
kernel/drivers/media/platform/am437x/am437x-vpfe.c
@@
-1185,14
+1185,24
@@
static int vpfe_initialize_device(struct vpfe_device *vpfe)
static int vpfe_release(struct file *file)
{
struct vpfe_device *vpfe = video_drvdata(file);
static int vpfe_release(struct file *file)
{
struct vpfe_device *vpfe = video_drvdata(file);
+ bool fh_singular;
int ret;
mutex_lock(&vpfe->lock);
int ret;
mutex_lock(&vpfe->lock);
- if (v4l2_fh_is_singular_file(file))
- vpfe_ccdc_close(&vpfe->ccdc, vpfe->pdev);
+ /* Save the singular status before we call the clean-up helper */
+ fh_singular = v4l2_fh_is_singular_file(file);
+
+ /* the release helper will cleanup any on-going streaming */
ret = _vb2_fop_release(file, NULL);
ret = _vb2_fop_release(file, NULL);
+ /*
+ * If this was the last open file.
+ * Then de-initialize hw module.
+ */
+ if (fh_singular)
+ vpfe_ccdc_close(&vpfe->ccdc, vpfe->pdev);
+
mutex_unlock(&vpfe->lock);
return ret;
mutex_unlock(&vpfe->lock);
return ret;
@@
-1577,7
+1587,7
@@
static int vpfe_s_fmt(struct file *file, void *priv,
return -EBUSY;
}
return -EBUSY;
}
- ret = vpfe_try_fmt(file, priv,
fm
t);
+ ret = vpfe_try_fmt(file, priv,
&forma
t);
if (ret)
return ret;
if (ret)
return ret;