From c8cae5f408d64811a751d1b00568087df122a57b Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Sat, 25 Mar 2006 03:08:12 -0800
Subject: [PATCH] --- yaml --- r: 23601 b: refs/heads/master c:
 656bde5728b824ca23fcab8bc5800b309ea48d64 h: refs/heads/master i:   23599:
 afe2333880ba415a4346389594c8cd2b0cf13a12 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pnp/isapnp/core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4be287f5564..534e6f6545b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bda44e1d168ac76fce5183eb141592fc645c7818
+refs/heads/master: 656bde5728b824ca23fcab8bc5800b309ea48d64
diff --git a/trunk/drivers/pnp/isapnp/core.c b/trunk/drivers/pnp/isapnp/core.c
index 57fd60314d59..b1b4b683cbdd 100644
--- a/trunk/drivers/pnp/isapnp/core.c
+++ b/trunk/drivers/pnp/isapnp/core.c
@@ -646,8 +646,10 @@ static int __init isapnp_create_device(struct pnp_card *card,
 				size = 0;
 				skip = 0;
 				option = pnp_register_independent_option(dev);
-				if (!option)
+				if (!option) {
+					kfree(dev);
 					return 1;
+				}
 				pnp_add_card_device(card,dev);
 			} else {
 				skip = 1;