xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32', 'spi/topic/ep93xx', 'spi/topic/fsl', 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi' and 'spi/topic/gpio' into spi-next

Browse Source
This commit is contained in:
Mark Brown
2014-03-30 00:51:10 +00:00
parent 9dee279b40 23e2c2aa45 c63f5da008 12f6dd860c 56fc0b42dc 7282326b72 0e0cd9ea89 f0a71337be e1bde3b11f
commit 3bcbc14911
14 changed files with 117 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-gpio.c
View File

@@ -250,7 +250,7 @@ static int spi_gpio_setup(struct spi_device *spi)
/*
* ... otherwise, take it from spi->controller_data
*/
cs = (unsigned int) spi->controller_data;
cs = (unsigned int)(uintptr_t) spi->controller_data;
}
if (!spi->controller_state) {