Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / net / caif / caif_spi.c

diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index c2cb852e13b83ac00c865ce6b3d665a3cd9db1cf..155db68e13bae83ce006d7835bdbc93d38cdd878 100644 (file)
--- a/drivers/net/caif/caif_spi.c
+++ b/drivers/net/caif/caif_spi.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Author:  Daniel Martensson / Daniel.Martensson@stericsson.com
+ * Author:  Daniel Martensson
  * License terms: GNU General Public License (GPL) version 2.
  */
 
@@ -28,7 +28,7 @@
 #endif /* CONFIG_CAIF_SPI_SYNC */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Daniel Martensson<daniel.martensson@stericsson.com>");
+MODULE_AUTHOR("Daniel Martensson");
 MODULE_DESCRIPTION("CAIF SPI driver");
 
 /* Returns the number of padding bytes for alignment. */
@@ -863,6 +863,7 @@ static int __init cfspi_init_module(void)
        driver_remove_file(&cfspi_spi_driver.driver,
                           &driver_attr_up_head_align);
  err_create_up_head_align:
+       platform_driver_unregister(&cfspi_spi_driver);
  err_dev_register:
        return result;
 }