[PATCH 13/15] media: soc_camera: Fix error reporting in expbuf
From: Hans Verkuil hans.verk...@cisco.com Remove unnecessary check and fix the error code for vb1 drivers. Signed-off-by: Hans Verkuil hans.verk...@cisco.com Signed-off-by: Rob Taylor rob.tay...@codethink.co.uk --- drivers/media/platform/soc_camera/soc_camera.c |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 7971388..bb181c1 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -470,14 +470,10 @@ static int soc_camera_expbuf(struct file *file, void *priv, struct soc_camera_device *icd = file-private_data; struct soc_camera_host *ici = to_soc_camera_host(icd-parent); - if (icd-streamer != file) - return -EBUSY; - /* videobuf2 only */ if (ici-ops-init_videobuf) - return -EINVAL; - else - return vb2_expbuf(icd-vb2_vidq, p); + return -ENOTTY; + return vb2_expbuf(icd-vb2_vidq, p); } /* Always entered with .host_lock held */ -- 1.7.10.4 -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 13/15] media: soc_camera: Fix error reporting in expbuf
From: Hans Verkuil hans.verk...@cisco.com Remove unnecessary check and fix the error code for vb1 drivers. Signed-off-by: Hans Verkuil hans.verk...@cisco.com Signed-off-by: Rob Taylor rob.tay...@codethink.co.uk --- drivers/media/platform/soc_camera/soc_camera.c |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 51daeb1..4e59833 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -470,14 +470,10 @@ static int soc_camera_expbuf(struct file *file, void *priv, struct soc_camera_device *icd = file-private_data; struct soc_camera_host *ici = to_soc_camera_host(icd-parent); - if (icd-streamer != file) - return -EBUSY; - /* videobuf2 only */ if (ici-ops-init_videobuf) - return -EINVAL; - else - return vb2_expbuf(icd-vb2_vidq, p); + return -ENOTTY; + return vb2_expbuf(icd-vb2_vidq, p); } /* Always entered with .host_lock held */ -- 1.7.10.4 -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 13/15] media: soc_camera: Fix error reporting in expbuf
From: Hans Verkuil hans.verk...@cisco.com Remove unnecessary check and fix the error code for vb1 drivers. Signed-off-by: Hans Verkuil hans.verk...@cisco.com Signed-off-by: Rob Taylor rob.tay...@codethink.co.uk --- drivers/media/platform/soc_camera/soc_camera.c |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index f6c05c6..a80cde5 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -470,14 +470,10 @@ static int soc_camera_expbuf(struct file *file, void *priv, struct soc_camera_device *icd = file-private_data; struct soc_camera_host *ici = to_soc_camera_host(icd-parent); - if (icd-streamer != file) - return -EBUSY; - /* videobuf2 only */ if (ici-ops-init_videobuf) - return -EINVAL; - else - return vb2_expbuf(icd-vb2_vidq, p); + return -ENOTTY; + return vb2_expbuf(icd-vb2_vidq, p); } /* Always entered with .host_lock held */ -- 1.7.10.4 -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html