diff options
| author | Abhilash Kesavan <a.kesavan@samsung.com> | 2015-01-10 04:11:35 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-17 04:10:41 +0100 |
| commit | 896ddd600ba4a3426aeb11710ae9c28dd7ce68ce (patch) | |
| tree | 37d60e5f4f20c237a1c66c1bdeef1999bf9156f4 | |
| parent | Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferr... (diff) | |
| download | linux-896ddd600ba4a3426aeb11710ae9c28dd7ce68ce.tar.xz linux-896ddd600ba4a3426aeb11710ae9c28dd7ce68ce.zip | |
drivers: bus: check cci device tree node status
The arm-cci driver completes the probe sequence even if the cci node is
marked as disabled. Add a check in the driver to honour the cci status
in the device tree.
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Tested-by: Sudeep Holla <sudeep.holla@arm.com>
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/bus/arm-cci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 860da40b78ef..0ce5e2d65a06 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -1312,6 +1312,9 @@ static int cci_probe(void) if (!np) return -ENODEV; + if (!of_device_is_available(np)) + return -ENODEV; + cci_config = of_match_node(arm_cci_matches, np)->data; if (!cci_config) return -ENODEV; |