Subject: [merged] rtc-tps6586x-device-wakeup-flags-correction.patch removed from -mm tree
To: digetx@xxxxxxxxx,jg1.han@xxxxxxxxxxx,ldewangan@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 13 Jun 2013 11:57:34 -0700
The patch titled
Subject: drivers/rtc/rtc-tps6586x.c: device wakeup flags correction
has been removed from the -mm tree. Its filename was
rtc-tps6586x-device-wakeup-flags-correction.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Dmitry Osipenko <digetx@xxxxxxxxx>
Subject: drivers/rtc/rtc-tps6586x.c: device wakeup flags correction
Use device_init_wakeup() instead of device_set_wakeup_capable() and move
it before rtc dev registering. This fixes alarmtimer not registered when
tps6586x rtc is the only wakeup compatible rtc in the system.
Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx>
Cc: Laxman Dewangan <ldewangan@xxxxxxxxxx>
Cc: Jingoo Han <jg1.han@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-tps6586x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/rtc/rtc-tps6586x.c~rtc-tps6586x-device-wakeup-flags-correction drivers/rtc/rtc-tps6586x.c
--- a/drivers/rtc/rtc-tps6586x.c~rtc-tps6586x-device-wakeup-flags-correction
+++ a/drivers/rtc/rtc-tps6586x.c
@@ -273,6 +273,8 @@ static int tps6586x_rtc_probe(struct pla
return ret;
}
+ device_init_wakeup(&pdev->dev, 1);
+
platform_set_drvdata(pdev, rtc);
rtc->rtc = devm_rtc_device_register(&pdev->dev, dev_name(&pdev->dev),
&tps6586x_rtc_ops, THIS_MODULE);
@@ -292,7 +294,6 @@ static int tps6586x_rtc_probe(struct pla
goto fail_rtc_register;
}
disable_irq(rtc->irq);
- device_set_wakeup_capable(&pdev->dev, 1);
return 0;
fail_rtc_register:
_
Patches currently in -mm which might be from digetx@xxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
