summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-11-15 06:49:30 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-15 06:49:30 +0000
commitc94f28c383f58c9de74678e0f1624db9c5f8a8cb (patch)
tree3281184f026cb79cee6c20fe29c994ba654cbbe4 /drivers/char/agp
parentdf15315899c0641412bd54b29565a70b078a6ac8 (diff)
parent1bb95834bbcdc969e477a9284cf96c17a4c2616f (diff)
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/parisc-agp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 1c129211302..94821ab01c6 100644
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
@@ -19,6 +19,7 @@
#include <linux/klist.h>
#include <linux/agp_backend.h>
#include <linux/log2.h>
+#include <linux/slab.h>
#include <asm/parisc-device.h>
#include <asm/ropes.h>
@@ -358,8 +359,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;
}