diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:43 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:43 +0800 |
commit | a898540914d4136f29bc738ce593c1c501006f23 (patch) | |
tree | 9440b7f76c029143611c89ed919718ba6ff353f4 /drivers/media/platform/am437x/am437x-vpfe.c | |
parent | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff) | |
parent | 56d847e3ef9433d7ac92376e4ba49d3cf3cb70d2 (diff) |
Merge tag 'v4.1.40' into linux-linaro-lsk-v4.1lsk-v4.1-17.06lsk-v4.1-17.05linux-linaro-lsk-v4.1
This is the 4.1.40 stable release
Diffstat (limited to 'drivers/media/platform/am437x/am437x-vpfe.c')
-rw-r--r-- | drivers/media/platform/am437x/am437x-vpfe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c index ddf59ee5ca40..fd7f66072413 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -1587,7 +1587,7 @@ static int vpfe_s_fmt(struct file *file, void *priv, return -EBUSY; } - ret = vpfe_try_fmt(file, priv, &format); + ret = __vpfe_get_format(vpfe, &format, &bpp); if (ret) return ret; |