1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b02b4533651d..e591de1bc704 100644
--- 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) {
@@ -676,11 +677,6 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
         dev_dbg(&ofdev->dev, "hw routines for %s registered.\n",
                 cpm->adap.name);
 
-        /*
-         * register OF I2C devices
-         */
-        of_register_i2c_devices(&cpm->adap, ofdev->dev.of_node);
-
         return 0;
 out_shut:
         cpm_i2c_shutdown(cpm);