Merge commit 'v2.6.28-rc7' into core/locking

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index dcce9f5d8465..4a110b7b2673 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/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;