diff -urpN -X ../dontdiff linux-2.6.19-spipatched/include/linux/spi/spi.h linux-2.6.19-spipatched-spi2/include/linux/spi/spi.h
--- linux-2.6.19-spipatched/include/linux/spi/spi.h	2007-01-16 00:01:50.000000000 +0000
+++ linux-2.6.19-spipatched-spi2/include/linux/spi/spi.h	2007-01-16 00:02:35.000000000 +0000
@@ -148,13 +148,11 @@ extern int spi_register_driver(struct sp
 
 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