diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-10-23 15:25:54 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-10-23 15:25:54 -0700 |
| commit | 0df341edfa5e7c119523a0c30146e88106f88b43 (patch) | |
| tree | b8a8bfabaa488d70ce49a7941e974bab023cb2d0 /drivers/soc | |
| parent | 9ac0b253c59216c9614436b2006d0557396eb268 (diff) | |
| parent | 205a8514e63a221c3a5071f27521013444e43e5f (diff) | |
Merge tag 'v4.1.11' into toradex_vf_4.1-next
This is the 4.1.11 stable release
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/tegra/pmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index c956395cf46f..c89bada875f8 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -732,12 +732,12 @@ void tegra_pmc_init_tsense_reset(struct tegra_pmc *pmc) u32 value, checksum; if (!pmc->soc->has_tsense_reset) - goto out; + return; np = of_find_node_by_name(pmc->dev->of_node, "i2c-thermtrip"); if (!np) { dev_warn(dev, "i2c-thermtrip node not found, %s.\n", disabled); - goto out; + return; } if (of_property_read_u32(np, "nvidia,i2c-controller-id", &ctrl_id)) { |