diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 12:51:27 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 12:51:27 +0400 |
| commit | 23e0ad77e1b3bc1e0a5d8d4c50266e559718e848 (patch) | |
| tree | feda5be14210eb05d5a9110fbd85bcbe022e5125 /drivers/spi | |
| parent | a59ca9773c587afac333dd0932bba0f1f113b396 (diff) | |
| parent | 6a009e8d886be476d7e6ea978c27c9517c449d3c (diff) | |
| download | linux-23e0ad77e1b3bc1e0a5d8d4c50266e559718e848.tar.xz | |
Merge remote-tracking branch 'spi/topic/efm32' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-efm32.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c index 18659fc6bef2..d4d3cc534792 100644 --- a/drivers/spi/spi-efm32.c +++ b/drivers/spi/spi-efm32.c @@ -280,10 +280,6 @@ static irqreturn_t efm32_spi_txirq(int irq, void *data) return IRQ_HANDLED; } -static const struct efm32_spi_pdata efm32_spi_pdata_default = { - .location = 1, -}; - static u32 efm32_spi_get_configured_location(struct efm32_spi_ddata *ddata) { u32 reg = efm32_spi_read32(ddata, REG_ROUTE); @@ -387,7 +383,7 @@ static int efm32_spi_probe(struct platform_device *pdev) goto err; } - if (resource_size(res) < 60) { + if (resource_size(res) < 0x60) { ret = -EINVAL; dev_err(&pdev->dev, "memory resource too small\n"); goto err; @@ -467,7 +463,6 @@ err_disable_clk: clk_disable_unprepare(ddata->clk); err: spi_master_put(master); - kfree(master); } return ret; @@ -486,7 +481,6 @@ static int efm32_spi_remove(struct platform_device *pdev) free_irq(ddata->rxirq, ddata); clk_disable_unprepare(ddata->clk); spi_master_put(master); - kfree(master); return 0; } |