diff options
| author | Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> | 2017-03-29 20:43:52 +0200 |
|---|---|---|
| committer | Eduardo Valentin <edubezval@gmail.com> | 2017-03-30 21:41:48 -0700 |
| commit | d51546c0db975a4750161d17eef62dfcf9eedc90 (patch) | |
| tree | 86f6a3a865e2851724e78285249567ff7934e194 /drivers/thermal | |
| parent | 100cfbcf2580b0605f50af32fefd9c8d1d8357fb (diff) | |
| download | linux-d51546c0db975a4750161d17eef62dfcf9eedc90.tar.gz linux-d51546c0db975a4750161d17eef62dfcf9eedc90.tar.bz2 linux-d51546c0db975a4750161d17eef62dfcf9eedc90.zip | |
thermal: rcar_gen3_thermal: check that TSC exists before memory allocation
Move the check for a TSC resource before allocating memory for a new
TSC. If no TSC is found there is little point in allocating memory for
it.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/rcar_gen3_thermal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index cb5c362c0000..9b6bc03dd142 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -276,16 +276,16 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) for (i = 0; i < TSC_MAX_NUM; i++) { struct rcar_gen3_thermal_tsc *tsc; + res = platform_get_resource(pdev, IORESOURCE_MEM, i); + if (!res) + break; + tsc = devm_kzalloc(dev, sizeof(*tsc), GFP_KERNEL); if (!tsc) { ret = -ENOMEM; goto error_unregister; } - res = platform_get_resource(pdev, IORESOURCE_MEM, i); - if (!res) - break; - tsc->base = devm_ioremap_resource(dev, res); if (IS_ERR(tsc->base)) { ret = PTR_ERR(tsc->base); |