diff --git a/[refs] b/[refs] index 1336bbddbfa3..fa3a3f90aa3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14fd9b3f8a0a36e706d144efcd579805a99de594 +refs/heads/master: ddc1e9753106cedcca7944d2b068baa2e14640b1 diff --git a/trunk/include/linux/spi/spi.h b/trunk/include/linux/spi/spi.h index e25fcae89d3b..851b25d6e82b 100644 --- a/trunk/include/linux/spi/spi.h +++ b/trunk/include/linux/spi/spi.h @@ -148,13 +148,11 @@ extern int spi_register_driver(struct spi_driver *sdrv); static inline void spi_unregister_driver(struct spi_driver *sdrv) { - if (!sdrv) - return; - driver_unregister(&sdrv->driver); + if (sdrv) + driver_unregister(&sdrv->driver); } - /** * struct spi_master - interface to SPI master controller * @cdev: class interface to this driver