From e48863a6a10732cf0da9019a9953d77724b08c9a Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Thu, 29 Nov 2012 13:54:36 -0800 Subject: [PATCH] --- yaml --- r: 336117 b: refs/heads/master c: 1430e17844e2cd15bc15f3c21b5349e762f6ba41 h: refs/heads/master i: 336115: 7d83ed03d8a400fe2f60a41213966a1ebedb4df5 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-tps65910.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1d64940c0ed4..376d938ccdc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 783657a7dc20e5c0efbc9a09a9dd38e238a723da +refs/heads/master: 1430e17844e2cd15bc15f3c21b5349e762f6ba41 diff --git a/trunk/drivers/rtc/rtc-tps65910.c b/trunk/drivers/rtc/rtc-tps65910.c index 7a82337e4dee..073108dcf9e7 100644 --- a/trunk/drivers/rtc/rtc-tps65910.c +++ b/trunk/drivers/rtc/rtc-tps65910.c @@ -288,11 +288,11 @@ static int __devinit tps65910_rtc_probe(struct platform_device *pdev) static int __devexit tps65910_rtc_remove(struct platform_device *pdev) { /* leave rtc running, but disable irqs */ - struct rtc_device *rtc = platform_get_drvdata(pdev); + struct tps65910_rtc *tps_rtc = platform_get_drvdata(pdev); - tps65910_rtc_alarm_irq_enable(&rtc->dev, 0); + tps65910_rtc_alarm_irq_enable(&pdev->dev, 0); - rtc_device_unregister(rtc); + rtc_device_unregister(tps_rtc->rtc); return 0; }