Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Linus Torvalds 14 years ago
parent
d21131bb0a a80fd9db0e
commit
365a13a582
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/rtc/rtc-m41t93.c
  2. 1 1
      drivers/spi/omap2_mcspi.c

+ 1 - 1
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)
 
 {
 
-	struct rtc_device *rtc = platform_get_drvdata(spi);
 
+	struct rtc_device *rtc = spi_get_drvdata(spi);
 
 
 	if (rtc)
 
 		rtc_device_unregister(rtc);

+ 1 - 1
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 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;