Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / spi / spi_nuc900.c

diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c
index dff63be0d0a8c7b23205d9374c209e3914805bfb..d5be18b3078c4e3440c45d1bd3fed1b66fc44491 100644 (file)
--- a/drivers/spi/spi_nuc900.c
+++ b/drivers/spi/spi_nuc900.c
@@ -449,7 +449,7 @@ err_iomap:
        release_mem_region(hw->res->start, resource_size(hw->res));
        kfree(hw->ioarea);
 err_pdata:
-       spi_master_put(hw->master);;
+       spi_master_put(hw->master);
 
 err_nomem:
        return err;