From 15e63b3dcf06865b18cb80a777a8878f9ae16fa1 Mon Sep 17 00:00:00 2001 From: Uli Luckas Date: Wed, 18 Jun 2008 09:54:03 +0100 Subject: [PATCH] --- yaml --- r: 98613 b: refs/heads/master c: e5a2c9ccb3e849fed70674ac6880536eaf553dba h: refs/heads/master i: 98611: 5117b3a17d16ca409aef464156a4f4cd312ad873 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-sa1100.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ffe19c82a2bd..45bc6fc065a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee98476bbc565f8fe42e198602e647288b6a258d +refs/heads/master: e5a2c9ccb3e849fed70674ac6880536eaf553dba diff --git a/trunk/drivers/rtc/rtc-sa1100.c b/trunk/drivers/rtc/rtc-sa1100.c index 82f62d25f921..67421b0d3a7b 100644 --- a/trunk/drivers/rtc/rtc-sa1100.c +++ b/trunk/drivers/rtc/rtc-sa1100.c @@ -331,14 +331,14 @@ static int sa1100_rtc_probe(struct platform_device *pdev) RCNR = 0; } + device_init_wakeup(&pdev->dev, 1); + rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); - device_init_wakeup(&pdev->dev, 1); - platform_set_drvdata(pdev, rtc); return 0;