Skip to content

Commit

Permalink
drivers: bus: check cci device tree node status
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Abhilash Kesavan authored and Olof Johansson committed Jan 17, 2015
1 parent 6fda93b commit 896ddd6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/bus/arm-cci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 896ddd6

Please sign in to comment.