From: Sergey Senozhatsky <senozhatsky@chromium.org>
Date: Thu, 14 May 2020 16:01:52 +0000 (+0200)
Subject: media: videobuf2: remove redundant if-statement
X-Git-Tag: v5.9-rc1~94^2~288
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ff99ca4bc30895f7e061f1fc0e510f19bd032bb;p=thirdparty%2Fkernel%2Flinux.git

media: videobuf2: remove redundant if-statement

That if-statement seems to be unneeded.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index a753a03bc48e6..ec3446cc45b8d 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -152,8 +152,7 @@ static void *vb2_dc_alloc(struct device *dev, unsigned long attrs,
 	if (!buf)
 		return ERR_PTR(-ENOMEM);
 
-	if (attrs)
-		buf->attrs = attrs;
+	buf->attrs = attrs;
 	buf->cookie = dma_alloc_attrs(dev, size, &buf->dma_addr,
 					GFP_KERNEL | gfp_flags, buf->attrs);
 	if (!buf->cookie) {