lkml.org 
[lkml]   [2010]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[099/200] rtc: s3c: initialize driver data before using it
    2.6.34-stable review patch.  If anyone has any objections, please let me know.

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

    From: Maurus Cuelenaere <mcuelenaere@gmail.com>

    commit e893de59a4982791368b3ce412bc67dd601a88a0 upstream.

    s3c_rtc_setfreq() uses the platform driver data to derive struct rtc_device,
    so make sure drvdata is set _before_ s3c_rtc_setfreq() is called.

    Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
    Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Maurus Cuelenaere <mcuelenaere@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/rtc/rtc-s3c.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/rtc/rtc-s3c.c
    +++ b/drivers/rtc/rtc-s3c.c
    @@ -457,8 +457,6 @@ static int __devinit s3c_rtc_probe(struc
    pr_debug("s3c2410_rtc: RTCCON=%02x\n",
    readb(s3c_rtc_base + S3C2410_RTCCON));

    - s3c_rtc_setfreq(&pdev->dev, 1);
    -
    device_init_wakeup(&pdev->dev, 1);

    /* register RTC and exit */
    @@ -475,6 +473,9 @@ static int __devinit s3c_rtc_probe(struc
    rtc->max_user_freq = 128;

    platform_set_drvdata(pdev, rtc);
    +
    + s3c_rtc_setfreq(&pdev->dev, 1);
    +
    return 0;

    err_nortc:



    \
     
     \ /
      Last update: 2010-07-01 23:49    [W:4.441 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site