michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: check if clock device is ready before accessing

Browse source 
Add check for device_is_ready() before accessing clock control devices.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-08-08 13:31:51 +02:00 • committed by Carles Cufí
commit 035c7d2190
6 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/can/can_esp32_twai.c
View file

@ -67,13 +67,22 @@ static int can_esp32_twai_init(const struct device *dev)
const struct can_esp32_twai_config *twai_config = sja1000_config->custom;
int err;
if (!device_is_ready(twai_config->clock_dev)) {
LOG_ERR("clock control device not ready");
return -ENODEV;
}
err = pinctrl_apply_state(twai_config->pcfg, PINCTRL_STATE_DEFAULT);
if (err != 0) {
LOG_ERR("failed to configure TWAI pins (err %d)", err);
return err;
}
clock_control_on(twai_config->clock_dev, twai_config->clock_subsys);
err = clock_control_on(twai_config->clock_dev, twai_config->clock_subsys);
if (err != 0) {
LOG_ERR("failed to enable CAN clock (err %d)", err);
return err;
}
err = can_sja1000_init(dev);
if (err != 0) {

5
drivers/can/can_mcux_mcan.c
View file

@ -46,6 +46,11 @@ static int mcux_mcan_init(const struct device *dev)
const struct mcux_mcan_config *mcux_config = mcan_config->custom;
int err;
if (!device_is_ready(mcux_config->clock_dev)) {
LOG_ERR("clock control device not ready");
return -ENODEV;
}
#ifdef CONFIG_PINCTRL
err = pinctrl_apply_state(mcux_config->pincfg, PINCTRL_STATE_DEFAULT);
if (err) {

5
drivers/can/can_rcar.c
View file

@ -941,6 +941,11 @@ static int can_rcar_init(const struct device *dev)
}
}
if (!device_is_ready(config->clock_dev)) {
LOG_ERR("clock control device not ready");
return -ENODEV;
}
/* Configure dt provided device signals when available */
ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
if (ret < 0) {

4
drivers/can/can_stm32.c
View file

@ -520,6 +520,10 @@ static int can_stm32_init(const struct device *dev)
}
clock = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
if (!device_is_ready(clock)) {
LOG_ERR("clock control device not ready");
return -ENODEV;
}
ret = clock_control_on(clock, (clock_control_subsys_t *) &cfg->pclken);
if (ret != 0) {

8
drivers/can/can_stm32fd.c
View file

@ -72,6 +72,7 @@ static int can_stm32fd_clock_enable(const struct device *dev)
int ret;
const struct can_mcan_config *mcan_cfg = dev->config;
const struct can_stm32fd_config *stm32fd_cfg = mcan_cfg->custom;
const struct device *clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
LL_RCC_SetFDCANClockSource(CAN_STM32FD_CLOCK_SOURCE);
@ -82,8 +83,11 @@ static int can_stm32fd_clock_enable(const struct device *dev)
LL_RCC_PLL2_EnableDomain_SAI();
#endif
ret = clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),
(clock_control_subsys_t *)&stm32fd_cfg->pclken);
if (!device_is_ready(clk)) {
return -ENODEV;
}
ret = clock_control_on(clk, (clock_control_subsys_t *)&stm32fd_cfg->pclken);
if (ret < 0) {
return ret;
}

5
drivers/can/can_stm32h7.c
View file

@ -52,6 +52,11 @@ static int can_stm32h7_clock_enable(const struct device *dev)
LL_RCC_SetFDCANClockSource(LL_RCC_FDCAN_CLKSOURCE_PLL1Q);
if (!device_is_ready(clk)) {
LOG_ERR("clock control device not ready");
return -ENODEV;
}
ret = clock_control_on(clk, (clock_control_subsys_t *)&stm32h7_cfg->pclken);
if (ret != 0) {
LOG_ERR("failure enabling clock");