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

[karo-tx-linux.git] / drivers / i2c / busses / i2c-puv3.c

diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c
index 261d7db437e250140349138903e653ab699ff519..37a84c87c5fdd3fe31df3007afe959be7f98c289 100644 (file)
--- a/drivers/i2c/busses/i2c-puv3.c
+++ b/drivers/i2c/busses/i2c-puv3.c
@@ -199,7 +199,7 @@ static int puv3_i2c_probe(struct platform_device *pdev)
 
        adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
        if (adapter == NULL) {
-               dev_err(&pdev->dev, "can't allocate inteface!\n");
+               dev_err(&pdev->dev, "can't allocate interface!\n");
                rc = -ENOMEM;
                goto fail_nomem;
        }
@@ -234,21 +234,15 @@ static int puv3_i2c_remove(struct platform_device *pdev)
 {
        struct i2c_adapter *adapter = platform_get_drvdata(pdev);
        struct resource *mem;
-       int rc;
 
-       rc = i2c_del_adapter(adapter);
-       if (rc) {
-               dev_err(&pdev->dev, "Adapter '%s' delete fail\n",
-                               adapter->name);
-               return rc;
-       }
+       i2c_del_adapter(adapter);
 
        put_device(&pdev->dev);
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        release_mem_region(mem->start, resource_size(mem));
 
-       return rc;
+       return 0;
 }
 
 #ifdef CONFIG_PM