Commit 365a13a5 authored by Linus Torvalds's avatar Linus Torvalds

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
parents d21131bb a80fd9db
...@@ -189,7 +189,7 @@ static int __devinit m41t93_probe(struct spi_device *spi) ...@@ -189,7 +189,7 @@ static int __devinit m41t93_probe(struct spi_device *spi)
static int __devexit m41t93_remove(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) if (rtc)
rtc_device_unregister(rtc); rtc_device_unregister(rtc);
......
...@@ -298,7 +298,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) ...@@ -298,7 +298,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
unsigned int count, c; unsigned int count, c;
unsigned long base, tx_reg, rx_reg; unsigned long base, tx_reg, rx_reg;
int word_len, data_type, element_count; int word_len, data_type, element_count;
int elements; int elements = 0;
u32 l; u32 l;
u8 * rx; u8 * rx;
const u8 * tx; const u8 * tx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment