diff options
Diffstat (limited to 'drivers/spi/spi-mpc52xx-psc.c')
| -rw-r--r-- | drivers/spi/spi-mpc52xx-psc.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c index 6e925dc3439..de532aa11d3 100644 --- a/drivers/spi/spi-mpc52xx-psc.c +++ b/drivers/spi/spi-mpc52xx-psc.c @@ -12,7 +12,6 @@   */  #include <linux/module.h> -#include <linux/init.h>  #include <linux/types.h>  #include <linux/errno.h>  #include <linux/interrupt.h> @@ -248,7 +247,8 @@ static void mpc52xx_psc_spi_work(struct work_struct *work)  		}  		m->status = status; -		m->complete(m->context); +		if (m->complete) +			m->complete(m->context);  		if (status || !cs_change)  			mpc52xx_psc_spi_deactivate_cs(spi); @@ -383,8 +383,8 @@ static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,  	mps->irq = irq;  	if (pdata == NULL) { -		dev_warn(dev, "probe called without platform data, no " -				"cs_control function will be called\n"); +		dev_warn(dev, +			 "probe called without platform data, no cs_control function will be called\n");  		mps->cs_control = NULL;  		mps->sysclk = 0;  		master->bus_num = bus_num;  | 
