diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:14:34 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:14:34 +0400 |
commit | f7a0fd56e4f58aec3300082fc10433052e2f1863 (patch) | |
tree | 4b3348f4866f6b3417f456a298229d63d4581424 /drivers/i2c/muxes/i2c-arb-gpio-challenge.c | |
parent | 5e1e704a7de14ae79dc4d983dbbcab67064960c9 (diff) | |
parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
download | linux-f7a0fd56e4f58aec3300082fc10433052e2f1863.tar.xz |
Merge 3.12-rc6 into staging-next.
We want these fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/muxes/i2c-arb-gpio-challenge.c')
-rw-r--r-- | drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c index 74b41ae690f3..928656e241dd 100644 --- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c +++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c @@ -200,7 +200,7 @@ static int i2c_arbitrator_probe(struct platform_device *pdev) arb->parent = of_find_i2c_adapter_by_node(parent_np); if (!arb->parent) { dev_err(dev, "Cannot find parent bus\n"); - return -EINVAL; + return -EPROBE_DEFER; } /* Actually add the mux adapter */ |