aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarbaros Tokaoglu <barbarost@gmail.com>2012-07-10 22:49:14 +0300
committerBarbaros Tokaoglu <barbarost@gmail.com>2012-07-10 22:49:14 +0300
commit1eee0cb44720771d2426a6cd0019633b0269f2e7 (patch)
tree7bc9b82260c9b27310016ac9b4bc900d9334c8ad
parent1b8153cc8ca36697f4d1dbf36916fbe506d6cd95 (diff)
downloadkernel_samsung_tuna-1eee0cb44720771d2426a6cd0019633b0269f2e7.zip
kernel_samsung_tuna-1eee0cb44720771d2426a6cd0019633b0269f2e7.tar.gz
kernel_samsung_tuna-1eee0cb44720771d2426a6cd0019633b0269f2e7.tar.bz2
OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines
Signed-off-by: Barbaros Tokaoglu <barbarost@gmail.com>
-rw-r--r--drivers/spi/omap2_mcspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index d54389c..bdf64c5 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -676,7 +676,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
/* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS
* REVISIT: this controller could support SPI_3WIRE mode.
*/
- if (cd->swap_datalines) {
+ if (cd && cd->swap_datalines) {
l &= ~OMAP2_MCSPI_CHCONF_DPE0;
l |= OMAP2_MCSPI_CHCONF_IS | OMAP2_MCSPI_CHCONF_DPE1;
} else {