From f39f61b6aa3187c8a82110ce9c3929136d3ca7b5 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 17 Dec 2012 16:04:21 -0800
Subject: [PATCH] --- yaml --- r: 346496 b: refs/heads/master c:
 31279b1457f992f24eee8d45ddd647f5fce42cf6 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/aoe/aoedev.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8f282c09e703..cf6896e7a364 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b37c7d865121249f2dee9ae25d524333b07be63
+refs/heads/master: 31279b1457f992f24eee8d45ddd647f5fce42cf6
diff --git a/trunk/drivers/block/aoe/aoedev.c b/trunk/drivers/block/aoe/aoedev.c
index e66ccbf41a50..98f2965778b9 100644
--- a/trunk/drivers/block/aoe/aoedev.c
+++ b/trunk/drivers/block/aoe/aoedev.c
@@ -461,6 +461,7 @@ aoedev_by_aoeaddr(ulong maj, int min, int do_alloc)
 	d->targets = kcalloc(NTARGETS, sizeof(*d->targets), GFP_ATOMIC);
 	if (!d->targets) {
 		kfree(d);
+		d = NULL;
 		goto out;
 	}
 	d->ntargets = NTARGETS;