Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / i2c / busses / i2c-omap.c

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index ab1279b8e2407ae33353526788a0665bc03217b3..c7da0c42baeefa8689693a9b3d237ccaa7dd5db7 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1425,10 +1425,8 @@ omap_i2c_probe(struct platform_device *pdev)
        /* i2c device drivers may be active on return from add_adapter() */
        adap->nr = pdev->id;
        r = i2c_add_numbered_adapter(adap);
-       if (r) {
-               dev_err(omap->dev, "failure adding adapter\n");
+       if (r)
                goto err_unuse_clocks;
-       }
 
        dev_info(omap->dev, "bus %d rev%d.%d at %d kHz\n", adap->nr,
                 major, minor, omap->speed);