1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
index 38eb24df796c..41b1346b29d5 100644
--- a/drivers/spi/spi-sh-sci.c
+++ b/drivers/spi/spi-sh-sci.c
@@ -109,7 +109,7 @@ static void sh_sci_spi_chipselect(struct spi_device *dev, int value)
 {
         struct sh_sci_spi *sp = spi_master_get_devdata(dev->master);
 
-        if (sp->info && sp->info->chip_select)
+        if (sp->info->chip_select)
                 (sp->info->chip_select)(sp->info, dev->chip_select, value);
 }
 
@@ -131,6 +131,11 @@ static int sh_sci_spi_probe(struct platform_device *dev)
 
         platform_set_drvdata(dev, sp);
         sp->info = dev_get_platdata(&dev->dev);
+        if (!sp->info) {
+                dev_err(&dev->dev, "platform data is missing\n");
+                ret = -ENOENT;
+                goto err1;
+        }
 
         /* setup spi bitbang adaptor */
         sp->bitbang.master = master;