summaryrefslogtreecommitdiff
path: root/drivers/media/pci/ddbridge/ddbridge-core.c
diff options
context:
space:
mode:
authorDaniel Scheller <d.scheller@gmx.net>2017-08-12 07:55:55 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-20 07:06:21 -0400
commite89e02a8654f3510114c72394753ab4977b754b3 (patch)
tree1000a195b7623f2fbd565af95951ef4bded07a87 /drivers/media/pci/ddbridge/ddbridge-core.c
parent69716934c7c5fdaf057dcbdb75da75d067f10e60 (diff)
media: ddbridge: check pointers before dereferencing
Fixes two warnings reported by smatch: drivers/media/pci/ddbridge/ddbridge-core.c:240 ddb_redirect() warn: variable dereferenced before check 'idev' (see line 238) drivers/media/pci/ddbridge/ddbridge-core.c:240 ddb_redirect() warn: variable dereferenced before check 'pdev' (see line 238) Fixed by moving the existing checks up before accessing members. Cc: Ralph Metzler <rjkm@metzlerbros.de> Signed-off-by: Daniel Scheller <d.scheller@gmx.net> Tested-by: Richard Scobie <r.scobie@clear.net.nz> Tested-by: Jasmin Jessich <jasmin@anw.at> Tested-by: Dietmar Spingler <d_spingler@freenet.de> Tested-by: Manfred Knick <Manfred.Knick@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/ddbridge/ddbridge-core.c')
-rw-r--r--drivers/media/pci/ddbridge/ddbridge-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index bbd8d556175b..d7bf01f38d98 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -170,10 +170,10 @@ static int ddb_redirect(u32 i, u32 p)
struct ddb *pdev = ddbs[(p >> 4) & 0x3f];
struct ddb_port *port;
- if (!idev->has_dma || !pdev->has_dma)
- return -EINVAL;
if (!idev || !pdev)
return -EINVAL;
+ if (!idev->has_dma || !pdev->has_dma)
+ return -EINVAL;
port = &pdev->port[p & 0x0f];
if (!port->output)