lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-06-08 13:54:46 -07:00
parent d21131bb0a a80fd9db0e
commit 365a13a582
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rtc/rtc-m41t93.c
View File

@@ -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);

2
drivers/spi/omap2_mcspi.c
View File

@@ -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;