]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
i2c-mux-pinctrl: Fix probe error path
authorGuenter Roeck <linux@roeck-us.net>
Sun, 11 Nov 2012 22:51:28 +0000 (09:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Nov 2012 22:51:28 +0000 (09:51 +1100)
When allocating the memory for i2c busses, the code checked the wrong
variable and thus never detected if there was a memory error.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/i2c/muxes/i2c-mux-pinctrl.c

index 5f097f309b9f9e92c59a5525db04283ab699fc74..7fa5b24b16db9a4a1c4c1a360f16dd01b018a215 100644 (file)
@@ -169,7 +169,7 @@ static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev)
        mux->busses = devm_kzalloc(&pdev->dev,
                                   sizeof(mux->busses) * mux->pdata->bus_count,
                                   GFP_KERNEL);
-       if (!mux->states) {
+       if (!mux->busses) {
                dev_err(&pdev->dev, "Cannot allocate busses\n");
                ret = -ENOMEM;
                goto err;