diff options
| author | Benson Leung <bleung@chromium.org> | 2018-07-09 16:36:00 -0700 |
|---|---|---|
| committer | Benson Leung <bleung@chromium.org> | 2018-07-09 16:36:00 -0700 |
| commit | 40291fb75123816b35ba06696e56b9cf2d96bf90 (patch) | |
| tree | dfff532af8df1c06ca83466c8347873426a81579 /drivers/clocksource/timer-stm32.c | |
| parent | c474e9f2be9992861d926eea3e5d4fb393cd6e2a (diff) | |
| parent | 413c94469a9db26ac4e1d16bf8de0248de93e2d8 (diff) | |
Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19
Immutable branch (mfd, chrome) due for the v4.19 window
Immutable Branch which moves the cros_ec_i2c and cros_ec_spi
transport drivers from mfd to platform/chrome. Changes in arm are a simple
rename in defconfigs. Change in input is a rename in help text.
Diffstat (limited to 'drivers/clocksource/timer-stm32.c')
| -rw-r--r-- | drivers/clocksource/timer-stm32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index e5cdc3af684c..2717f88c7904 100644 --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -304,8 +304,10 @@ static int __init stm32_timer_init(struct device_node *node) to->private_data = kzalloc(sizeof(struct stm32_timer_private), GFP_KERNEL); - if (!to->private_data) + if (!to->private_data) { + ret = -ENOMEM; goto deinit; + } rstc = of_reset_control_get(node, NULL); if (!IS_ERR(rstc)) { |