From ad3fa3e632e2099cfb209858fe5f9e79445aac3d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 22 Dec 2011 02:29:34 -0300
Subject: [PATCH] --- yaml --- r: 285717 b: refs/heads/master c:
 aecf33db58cbcb40299a7630b3b6c89aa126fcb6 h: refs/heads/master i:   285715:
 c89f116aef94e6aa685d1d261081f0eb67a286bf v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 41dcba02eab4..0118ea33d7de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 527f18be2d69db4752e5b7f227548a075a37749b
+refs/heads/master: aecf33db58cbcb40299a7630b3b6c89aa126fcb6
diff --git a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 25c6025eb54f..280c84ec4cc2 100644
--- a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -908,9 +908,10 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (err)
 		goto err_req_region;
 	pd->regs = pci_iomap(pdev, 0, pci_resource_len(pd->pdev, 0));
-	if (!pd->regs)
+	if (!pd->regs) {
 		err = -ENOMEM;
 		goto err_pci_iomap;
+	}
 	err = dt3155_init_board(pdev);
 	if (err)
 		goto err_init_board;