lkml.org 
[lkml]   [2018]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 44/89] rtc: omap: fix potential crash on power off
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit 5c8b84f410b3819d14cb1ebf32e4b3714b5a6e0b upstream.

    Do not set the system power-off callback and omap power-off rtc pointer
    until we're done setting up our device to avoid leaving stale pointers
    around after a late probe error.

    Fixes: 97ea1906b3c2 ("rtc: omap: Support ext_wakeup configuration")
    Cc: stable <stable@vger.kernel.org> # 4.9
    Cc: Marcin Niestroj <m.niestroj@grinn-global.com>
    Cc: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Acked-by: Tony Lindgren <tony@atomide.com>
    Reviewed-by: Marcin Niestroj <m.niestroj@grinn-global.com>
    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/rtc/rtc-omap.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/drivers/rtc/rtc-omap.c
    +++ b/drivers/rtc/rtc-omap.c
    @@ -817,13 +817,6 @@ static int omap_rtc_probe(struct platfor
    goto err;
    }

    - if (rtc->is_pmic_controller) {
    - if (!pm_power_off) {
    - omap_rtc_power_off_rtc = rtc;
    - pm_power_off = omap_rtc_power_off;
    - }
    - }
    -
    /* Support ext_wakeup pinconf */
    rtc_pinctrl_desc.name = dev_name(&pdev->dev);

    @@ -833,6 +826,13 @@ static int omap_rtc_probe(struct platfor
    return PTR_ERR(rtc->pctldev);
    }

    + if (rtc->is_pmic_controller) {
    + if (!pm_power_off) {
    + omap_rtc_power_off_rtc = rtc;
    + pm_power_off = omap_rtc_power_off;
    + }
    + }
    +
    return 0;

    err:

    \
     
     \ /
      Last update: 2018-09-07 23:56    [W:4.041 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site