diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-05-25 14:11:54 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-25 14:11:54 -0700 |
| commit | 280b0471fd2c6823e486919bef01e20c7c503297 (patch) | |
| tree | 1edd8989647bda54fdf22139037e5f9448c1d4cd /drivers/bus | |
| parent | Merge tag 'sunxi-core-for-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc (diff) | |
| parent | bus: ti-sysc: Fix optional clocks array access (diff) | |
| download | linux-dev-280b0471fd2c6823e486919bef01e20c7c503297.tar.xz linux-dev-280b0471fd2c6823e486919bef01e20c7c503297.zip | |
Merge tag 'omap-for-v4.18/ti-sysc-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
One ti-sysc fix for v4.18 merge window
This fixes an array access errors if there are more optional clocks
than one.
* tag 'omap-for-v4.18/ti-sysc-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
bus: ti-sysc: Fix optional clocks array access
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/ti-sysc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 9cd8cd8c436e..1cc29629d238 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -128,7 +128,7 @@ static int sysc_get_one_clock(struct sysc *ddata, const char *name) if (index < 0) { for (i = SYSC_OPTFCK0; i < SYSC_MAX_CLOCKS; i++) { - if (!clock_names[i]) { + if (!ddata->clocks[i]) { index = i; break; } |