summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/muxes/i2c-mux-pinctrl.c
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2013-10-17 16:04:47 +0200
committerGleb Natapov <gleb@redhat.com>2013-10-17 16:41:49 +0200
commit13acfd5715144518232d8e29acf7c76ef1b089d8 (patch)
tree093c4311a737210bbdd3d1919f8193cb5f017241 /drivers/i2c/muxes/i2c-mux-pinctrl.c
parentMerge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm... (diff)
parentMerge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff)
downloadlinux-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.xz
linux-13acfd5715144518232d8e29acf7c76ef1b089d8.zip
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies. Conflicts: arch/arm/kvm/reset.c
Diffstat (limited to 'drivers/i2c/muxes/i2c-mux-pinctrl.c')
-rw-r--r--drivers/i2c/muxes/i2c-mux-pinctrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index 69a91732ae65..68a37157377d 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -113,7 +113,7 @@ static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
adapter = of_find_i2c_adapter_by_node(adapter_np);
if (!adapter) {
dev_err(mux->dev, "Cannot find parent bus\n");
- return -ENODEV;
+ return -EPROBE_DEFER;
}
mux->pdata->parent_bus_num = i2c_adapter_id(adapter);
put_device(&adapter->dev);
@@ -211,7 +211,7 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
if (!mux->parent) {
dev_err(&pdev->dev, "Parent adapter (%d) not found\n",
mux->pdata->parent_bus_num);
- ret = -ENODEV;
+ ret = -EPROBE_DEFER;
goto err;
}