diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2014-03-04 12:18:31 +0530 |
|---|---|---|
| committer | Juha Tukkinen <jtukkinen@nvidia.com> | 2014-03-03 23:33:17 -0800 |
| commit | ca7fe04e05b14a98eebd07832f91d6a2548a374e (patch) | |
| tree | f4095ee8e400c7e786821cd7a42548932eff8be9 /drivers | |
| parent | 1f4f30dc22e405cad98e736c508eaab429b6ae8f (diff) | |
media: tegra: nvavp: Fix build break
Change code for nvavp_channel_open to be compliant with
tegra_nvavp_open. This should fix the build break.
Change-Id: I8a95fadcdac87a5a05eb7d4a2d5567bdb5cdc612
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-on: http://git-master/r/376962
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/tegra/nvavp/nvavp_dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/platform/tegra/nvavp/nvavp_dev.c b/drivers/media/platform/tegra/nvavp/nvavp_dev.c index a2030602feb1..683feeaa7fb2 100644 --- a/drivers/media/platform/tegra/nvavp/nvavp_dev.c +++ b/drivers/media/platform/tegra/nvavp/nvavp_dev.c @@ -2023,12 +2023,16 @@ nvavp_channel_open(struct file *filp, struct nvavp_channel_open_args *arg) fd_install(fd, file); - err = tegra_nvavp_open(file->f_inode, file, clientctx->channel_id); + nonseekable_open(file->f_inode, filp); + mutex_lock(&nvavp->open_lock); + err = tegra_nvavp_open(nvavp, &clientctx, clientctx->channel_id); if (err) { put_unused_fd(fd); fput(file); + mutex_unlock(&nvavp->open_lock); return err; } + mutex_unlock(&nvavp->open_lock); arg->channel_fd = fd; return err; |