diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-10-20 17:49:10 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-10-20 17:49:10 -0700 |
| commit | 94adb5e29e0e583283183dbaa852ee9d7d0c4c26 (patch) | |
| tree | 3038a63f3ed9632711100f1187c4c53c304b785b /drivers/rtc/rtc-gamecube.c | |
| parent | 36875a063b5e3618b42f7bace850473bb88a7c24 (diff) | |
| parent | 6d36c728bc2e2d632f4b0dea00df5532e20dfdab (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/rtc/rtc-gamecube.c')
| -rw-r--r-- | drivers/rtc/rtc-gamecube.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-gamecube.c b/drivers/rtc/rtc-gamecube.c index c2717bb52b2b..c828bc8e05b9 100644 --- a/drivers/rtc/rtc-gamecube.c +++ b/drivers/rtc/rtc-gamecube.c @@ -265,18 +265,17 @@ static int gamecube_rtc_read_offset_from_sram(struct priv *d) * SRAM address as on previous consoles. */ ret = regmap_read(d->regmap, RTC_SRAM_BIAS, &d->rtc_bias); - if (ret) { - pr_err("failed to get the RTC bias\n"); - iounmap(hw_srnprot); - return -1; - } /* Reset SRAM access to how it was before, our job here is done. */ if (old != 0x7bf) iowrite32be(old, hw_srnprot); + iounmap(hw_srnprot); - return 0; + if (ret) + pr_err("failed to get the RTC bias\n"); + + return ret; } static const struct regmap_range rtc_rd_ranges[] = { |