projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x...
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-mpc512x-psc.c
diff --git
a/drivers/spi/spi-mpc512x-psc.c
b/drivers/spi/spi-mpc512x-psc.c
index
9602bbd
..
8767658
100644
(file)
--- a/
drivers/spi/spi-mpc512x-psc.c
+++ b/
drivers/spi/spi-mpc512x-psc.c
@@
-557,7
+557,7
@@
free_master:
static int mpc512x_psc_spi_do_remove(struct device *dev)
{
static int mpc512x_psc_spi_do_remove(struct device *dev)
{
- struct spi_master *master =
spi_master_get(dev_get_drvdata(dev)
);
+ struct spi_master *master =
dev_get_drvdata(dev
);
struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
clk_disable_unprepare(mps->clk_mclk);
struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
clk_disable_unprepare(mps->clk_mclk);