From d6e61487dbc39ca5e69ca9c2364ca75602f0d877 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 20 Oct 2010 15:55:45 -0700
Subject: [PATCH] --- yaml --- r: 218927 b: refs/heads/master c:
 338e4fab3d41aa14264e10ce505a7c908633cdad h: refs/heads/master i:   218925:
 43ca1667ebdd8f36bf89d69e95b155e6871cecef   218923:
 a3628f9538be43e051a63f72d8d0fc6bb5d8b3d1   218919:
 d5a2b98348fad797e976bbf035f712f7a73bee71   218911:
 1fc47506f9bc5a39e875ca8696d4b2f13b7a326b v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/agp/parisc-agp.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22c804ce5460..425da302361a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7da1272547ebe96982a42292dfc833457708f4da
+refs/heads/master: 338e4fab3d41aa14264e10ce505a7c908633cdad
diff --git a/trunk/drivers/char/agp/parisc-agp.c b/trunk/drivers/char/agp/parisc-agp.c
index 1c129211302d..17e380f5f818 100644
--- a/trunk/drivers/char/agp/parisc-agp.c
+++ b/trunk/drivers/char/agp/parisc-agp.c
@@ -358,8 +358,12 @@ parisc_agp_setup(void __iomem *ioc_hpa, void __iomem *lba_hpa)
 	bridge->dev = fake_bridge_dev;
 
 	error = agp_add_bridge(bridge);
+	if (error)
+		goto fail;
+	return 0;
 
 fail:
+	kfree(fake_bridge_dev);
 	return error;
 }