Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7348d82a67b3fe0363e7f0679b50ecbdc65116c7

Authored by Daniel Ribeiro
Committed by Linus Torvalds
1 parent 816dc3c82b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

pxa2xx_spi: prevent panic case setup() fails 

setup() may fail before ctldata is set, causing a kernel panic on
cleanup().

Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

drivers/spi/pxa2xx_spi.c
Diff comments   View file @ 7348d82
... ... @@ -1373,6 +1373,9 @@
1373 1373 {
1374 1374 struct chip_data *chip = spi_get_ctldata(spi);
1375 1375  
  1376 + if (!chip)
  1377 + return;
  1378 +
1376 1379 if (gpio_is_valid(chip->gpio_cs))
1377 1380 gpio_free(chip->gpio_cs);
1378 1381