diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-12 23:19:58 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-12 23:19:58 +0300 |
commit | c6bb11147eb09bd39f316c6062455b88c905ab6e (patch) | |
tree | 5a1a6ec2970daef5fa8546741ced3ef3924bf807 /drivers/pinctrl/actions/pinctrl-owl.c | |
parent | a8802d97e73346bc81609df9dfba7d3306f40d87 (diff) | |
parent | b061c7a513afe14a68af41cec7c3476befc40e95 (diff) | |
download | linux-c6bb11147eb09bd39f316c6062455b88c905ab6e.tar.xz |
Merge branch 'fortglx/4.19/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeeping updates from John Stultz:
- Make the timekeeping update more precise when NTP frequency is set
directly by updating the multiplier.
- Adjust selftests
Diffstat (limited to 'drivers/pinctrl/actions/pinctrl-owl.c')
-rw-r--r-- | drivers/pinctrl/actions/pinctrl-owl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/actions/pinctrl-owl.c b/drivers/pinctrl/actions/pinctrl-owl.c index 76243caa08c6..b5c880b50bb3 100644 --- a/drivers/pinctrl/actions/pinctrl-owl.c +++ b/drivers/pinctrl/actions/pinctrl-owl.c @@ -333,7 +333,7 @@ static int owl_pin_config_set(struct pinctrl_dev *pctrldev, unsigned long flags; unsigned int param; u32 reg, bit, width, arg; - int ret, i; + int ret = 0, i; info = &pctrl->soc->padinfo[pin]; |