Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / rtc / rtc-max6902.c

diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 657403ebd54a81fe7ddeda43d2c693234f148c81..0ec3f588a255dc1abe0cff5bc900cded2bdc8b59 100644 (file)
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -139,12 +139,13 @@ static int __devinit max6902_probe(struct spi_device *spi)
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
 
+       dev_set_drvdata(&spi->dev, rtc);
        return 0;
 }
 
 static int __devexit max6902_remove(struct spi_device *spi)
 {
-       struct rtc_device *rtc = platform_get_drvdata(spi);
+       struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
 
        rtc_device_unregister(rtc);
        return 0;