diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/spi/spi_nuc900.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/spi/spi_nuc900.c')
| -rw-r--r-- | drivers/spi/spi_nuc900.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c index dff63be0d0a8..3cd15f690f16 100644 --- a/drivers/spi/spi_nuc900.c +++ b/drivers/spi/spi_nuc900.c | |||
| @@ -449,7 +449,7 @@ err_iomap: | |||
| 449 | release_mem_region(hw->res->start, resource_size(hw->res)); | 449 | release_mem_region(hw->res->start, resource_size(hw->res)); |
| 450 | kfree(hw->ioarea); | 450 | kfree(hw->ioarea); |
| 451 | err_pdata: | 451 | err_pdata: |
| 452 | spi_master_put(hw->master);; | 452 | spi_master_put(hw->master); |
| 453 | 453 | ||
| 454 | err_nomem: | 454 | err_nomem: |
| 455 | return err; | 455 | return err; |
| @@ -463,7 +463,7 @@ static int __devexit nuc900_spi_remove(struct platform_device *dev) | |||
| 463 | 463 | ||
| 464 | platform_set_drvdata(dev, NULL); | 464 | platform_set_drvdata(dev, NULL); |
| 465 | 465 | ||
| 466 | spi_unregister_master(hw->master); | 466 | spi_bitbang_stop(&hw->bitbang); |
| 467 | 467 | ||
| 468 | clk_disable(hw->clk); | 468 | clk_disable(hw->clk); |
| 469 | clk_put(hw->clk); | 469 | clk_put(hw->clk); |