diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 16:54:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 16:54:46 -0400 |
| commit | 365a13a582e6a80c639c54dc2a83b03b9ff0169a (patch) | |
| tree | d706678393969e2742e23cf88a6469e7124af74d /drivers/rtc | |
| parent | d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c (diff) | |
| parent | a80fd9db0e1909a03e5d5a29e2e73001e38d12f5 (diff) | |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
spi/rtc-m41t93: Use spi_get_drvdata() for SPI devices
spi/omap2: fix uninitialized variable
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-m41t93.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-m41t93.c b/drivers/rtc/rtc-m41t93.c index 1a84b3e227d1..7317d3b9a3d5 100644 --- a/drivers/rtc/rtc-m41t93.c +++ b/drivers/rtc/rtc-m41t93.c | |||
| @@ -189,7 +189,7 @@ static int __devinit m41t93_probe(struct spi_device *spi) | |||
| 189 | 189 | ||
| 190 | static int __devexit m41t93_remove(struct spi_device *spi) | 190 | static int __devexit m41t93_remove(struct spi_device *spi) |
| 191 | { | 191 | { |
| 192 | struct rtc_device *rtc = platform_get_drvdata(spi); | 192 | struct rtc_device *rtc = spi_get_drvdata(spi); |
| 193 | 193 | ||
| 194 | if (rtc) | 194 | if (rtc) |
| 195 | rtc_device_unregister(rtc); | 195 | rtc_device_unregister(rtc); |