summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-08 13:54:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-08 13:54:46 -0700
commit365a13a582e6a80c639c54dc2a83b03b9ff0169a (patch)
treed706678393969e2742e23cf88a6469e7124af74d /drivers
parentd21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c (diff)
parenta80fd9db0e1909a03e5d5a29e2e73001e38d12f5 (diff)
downloadlinux-365a13a582e6a80c639c54dc2a83b03b9ff0169a.tar.bz2
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')
-rw-r--r--drivers/rtc/rtc-m41t93.c2
-rw-r--r--drivers/spi/omap2_mcspi.c2
2 files changed, 2 insertions, 2 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)
static int __devexit m41t93_remove(struct spi_device *spi)
{
- struct rtc_device *rtc = platform_get_drvdata(spi);
+ struct rtc_device *rtc = spi_get_drvdata(spi);
if (rtc)
rtc_device_unregister(rtc);
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 6f86ba0175ac..969cdd2fe124 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -298,7 +298,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
unsigned int count, c;
unsigned long base, tx_reg, rx_reg;
int word_len, data_type, element_count;
- int elements;
+ int elements = 0;
u32 l;
u8 * rx;
const u8 * tx;