of/i2c: Generalize OF support

[pandora-kernel.git] / drivers / i2c / busses / i2c-cpm.c

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b02b453..03ae62e 100644 (file)
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -652,6 +652,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
        cpm->adap = cpm_ops;
        i2c_set_adapdata(&cpm->adap, cpm);
        cpm->adap.dev.parent = &ofdev->dev;
+       cpm->adap.dev.of_node = of_node_get(ofdev->dev.of_node);
 
        result = cpm_i2c_setup(cpm);
        if (result) {
@@ -679,7 +680,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
        /*
         * register OF I2C devices
         */
-       of_register_i2c_devices(&cpm->adap, ofdev->dev.of_node);
+       of_i2c_register_devices(&cpm->adap);
 
        return 0;
 out_shut: