]>
Commit | Line | Data |
---|---|---|
1df8150e GKH |
1 | From aa1e3e81e75ceb3d977c3292cefafcd5179eb8b8 Mon Sep 17 00:00:00 2001 |
2 | From: Guenter Roeck <linux@roeck-us.net> | |
3 | Date: Tue, 13 Nov 2012 22:27:19 +0100 | |
4 | Subject: i2c-mux-pinctrl: Fix probe error path | |
5 | ||
6 | From: Guenter Roeck <linux@roeck-us.net> | |
7 | ||
8 | commit aa1e3e81e75ceb3d977c3292cefafcd5179eb8b8 upstream. | |
9 | ||
10 | When allocating the memory for i2c busses, the code checked the wrong | |
11 | variable and thus never detected if there was a memory error. | |
12 | ||
13 | Signed-off-by: Guenter Roeck <linux@roeck-us.net> | |
14 | Signed-off-by: Jean Delvare <khali@linux-fr.org> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
16 | ||
17 | --- | |
18 | drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +- | |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
20 | ||
21 | --- a/drivers/i2c/muxes/i2c-mux-pinctrl.c | |
22 | +++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c | |
23 | @@ -169,7 +169,7 @@ static int __devinit i2c_mux_pinctrl_pro | |
24 | mux->busses = devm_kzalloc(&pdev->dev, | |
25 | sizeof(mux->busses) * mux->pdata->bus_count, | |
26 | GFP_KERNEL); | |
27 | - if (!mux->states) { | |
28 | + if (!mux->busses) { | |
29 | dev_err(&pdev->dev, "Cannot allocate busses\n"); | |
30 | ret = -ENOMEM; | |
31 | goto err; |