From cfd296273fbaea1923d85fbfb709034addf282cb Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 13 Nov 2012 22:27:19 +0100 Subject: [PATCH] --- yaml --- r: 335653 b: refs/heads/master c: aa1e3e81e75ceb3d977c3292cefafcd5179eb8b8 h: refs/heads/master i: 335651: 2971ef8076ea7fa90f8524c2d6367c1756fd8a01 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6dc69b5e7c6b..d70e877e673c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d85c8a6ab2bb0ba067a2a72c63c3bd20e6788996 +refs/heads/master: aa1e3e81e75ceb3d977c3292cefafcd5179eb8b8 diff --git a/trunk/drivers/i2c/muxes/i2c-mux-pinctrl.c b/trunk/drivers/i2c/muxes/i2c-mux-pinctrl.c index 5f097f309b9f..7fa5b24b16db 100644 --- a/trunk/drivers/i2c/muxes/i2c-mux-pinctrl.c +++ b/trunk/drivers/i2c/muxes/i2c-mux-pinctrl.c @@ -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;