From c04ef020c50d12e3f84bfff563618f86e8aecda6 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sun, 2 Nov 2008 19:55:45 +0100
Subject: [PATCH] --- yaml --- r: 119055 b: refs/heads/master c:
 e689597fe890cf22e23195037aa668c39b25ae4b h: refs/heads/master i:   119053:
 924730af31bae23667959d4bfdcf0b27781f0d45   119051:
 7ef8a43b66ef662489c999bdd24e8cfa2435a197   119047:
 1c0f926340b3cf8ad1f36abe9045e29b38456ef9   119039:
 45ddee2e644555227a7b74ff50121e1c3447b7ef v: v3

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

diff --git a/[refs] b/[refs]
index 522f54d50532..78f677ca852d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2509698687e2d8265a19d800f7daa6f87790a529
+refs/heads/master: e689597fe890cf22e23195037aa668c39b25ae4b
diff --git a/trunk/drivers/pcmcia/cistpl.c b/trunk/drivers/pcmcia/cistpl.c
index dcce9f5d8465..4a110b7b2673 100644
--- a/trunk/drivers/pcmcia/cistpl.c
+++ b/trunk/drivers/pcmcia/cistpl.c
@@ -351,10 +351,11 @@ int verify_cis_cache(struct pcmcia_socket *s)
 	char *buf;
 
 	buf = kmalloc(256, GFP_KERNEL);
-	if (buf == NULL)
+	if (buf == NULL) {
 		dev_printk(KERN_WARNING, &s->dev,
 			   "no memory for verifying CIS\n");
 		return -ENOMEM;
+	}
 	list_for_each_entry(cis, &s->cis_cache, node) {
 		int len = cis->len;