Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus

[pandora-kernel.git] / arch / powerpc / kernel / ibmebus.c

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 9b626cf..f62efdf 100644 (file)
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -162,13 +162,10 @@ static int ibmebus_create_device(struct device_node *dn)
        dev->dev.bus = &ibmebus_bus_type;
        dev->dev.archdata.dma_ops = &ibmebus_dma_ops;
 
-       ret = of_device_register(dev);
-       if (ret) {
-               of_device_free(dev);
-               return ret;
-       }
-
-       return 0;
+       ret = of_device_add(dev);
+       if (ret)
+               platform_device_put(dev);
+       return ret;
 }
 
 static int ibmebus_create_devices(const struct of_device_id *matches)