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

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

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index bb3a9964f7e00c2b2c604e32490b0c5f015c4bfe..e828a1dba0e5a5d4cafdcfaf4c1188df89f04b1a 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1114,16 +1114,12 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
        }
 
        i2c = devm_kzalloc(&pdev->dev, sizeof(struct s3c24xx_i2c), GFP_KERNEL);
-       if (!i2c) {
-               dev_err(&pdev->dev, "no memory for state\n");
+       if (!i2c)
                return -ENOMEM;
-       }
 
        i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-       if (!i2c->pdata) {
-               dev_err(&pdev->dev, "no memory for platform data\n");
+       if (!i2c->pdata)
                return -ENOMEM;
-       }
 
        i2c->quirks = s3c24xx_get_device_quirks(pdev);
        if (pdata)