* [PATCH] Staging: media: davinci_vpfe: fix indentation issue in vpfe_video.c
@ 2016-10-23 12:02 Leo Sperling
2016-11-22 21:38 ` Laurent Pinchart
0 siblings, 1 reply; 2+ messages in thread
From: Leo Sperling @ 2016-10-23 12:02 UTC (permalink / raw)
To: mchehab, gregkh; +Cc: linux-media, devel, linux-kernel, Leo Sperling
This is a patch to the vpfe_video.c file that fixes an indentation
warning reported by checkpatch.pl
Signed-off-by: Leo Sperling <leosperling97@gmail.com>
---
drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 8be9f85..c34bf46 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -1143,8 +1143,8 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
/* Initialize buffer */
vb2_set_plane_payload(vb, 0, video->fmt.fmt.pix.sizeimage);
if (vb2_plane_vaddr(vb, 0) &&
- vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
- return -EINVAL;
+ vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
+ return -EINVAL;
addr = vb2_dma_contig_plane_dma_addr(vb, 0);
/* Make sure user addresses are aligned to 32 bytes */
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Staging: media: davinci_vpfe: fix indentation issue in vpfe_video.c
2016-10-23 12:02 [PATCH] Staging: media: davinci_vpfe: fix indentation issue in vpfe_video.c Leo Sperling
@ 2016-11-22 21:38 ` Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2016-11-22 21:38 UTC (permalink / raw)
To: Leo Sperling; +Cc: mchehab, gregkh, linux-media, devel, linux-kernel
Hi Leo,
Thank you for the patch, and sorry for the late reply.
On Sunday 23 Oct 2016 14:02:23 Leo Sperling wrote:
> This is a patch to the vpfe_video.c file that fixes an indentation
> warning reported by checkpatch.pl
>
> Signed-off-by: Leo Sperling <leosperling97@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
and applied to my tree. I will send a pull request for v4.11.
> ---
> drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c
> b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 8be9f85..c34bf46
> 100644
> --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
> +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
> @@ -1143,8 +1143,8 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
> /* Initialize buffer */
> vb2_set_plane_payload(vb, 0, video->fmt.fmt.pix.sizeimage);
> if (vb2_plane_vaddr(vb, 0) &&
> - vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
> - return -EINVAL;
> + vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
> + return -EINVAL;
>
> addr = vb2_dma_contig_plane_dma_addr(vb, 0);
> /* Make sure user addresses are aligned to 32 bytes */
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-22 21:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-23 12:02 [PATCH] Staging: media: davinci_vpfe: fix indentation issue in vpfe_video.c Leo Sperling
2016-11-22 21:38 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).