diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-07-02 23:21:21 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-07-02 23:21:21 -0700 |
| commit | f18ccd5d902138d099de0f38fb9b1510db5c9648 (patch) | |
| tree | 532e9901e3ebee7877e1da38e041e1e3b2c0f896 | |
| parent | 07eaa43e66f505980d00e0f5fe697f3da7c6a730 (diff) | |
| parent | 207490517cf80d99f471d1b54e747eb95a4b8bea (diff) | |
| download | linux-f18ccd5d902138d099de0f38fb9b1510db5c9648.tar.gz linux-f18ccd5d902138d099de0f38fb9b1510db5c9648.tar.bz2 linux-f18ccd5d902138d099de0f38fb9b1510db5c9648.zip | |
Merge branch 'omap-for-v4.19/ti-sysc' into omap-for-v4.18/fixes
| -rw-r--r-- | drivers/bus/ti-sysc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 1cc29629d238..80d60f43db56 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -169,9 +169,9 @@ static int sysc_get_clocks(struct sysc *ddata) const char *name; int nr_fck = 0, nr_ick = 0, i, error = 0; - ddata->clock_roles = devm_kzalloc(ddata->dev, - sizeof(*ddata->clock_roles) * + ddata->clock_roles = devm_kcalloc(ddata->dev, SYSC_MAX_CLOCKS, + sizeof(*ddata->clock_roles), GFP_KERNEL); if (!ddata->clock_roles) return -ENOMEM; @@ -200,8 +200,8 @@ static int sysc_get_clocks(struct sysc *ddata) return -EINVAL; } - ddata->clocks = devm_kzalloc(ddata->dev, - sizeof(*ddata->clocks) * ddata->nr_clocks, + ddata->clocks = devm_kcalloc(ddata->dev, + ddata->nr_clocks, sizeof(*ddata->clocks), GFP_KERNEL); if (!ddata->clocks) return -ENOMEM; |