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 tag 'dlm-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-s3c24xx.c
diff --git
a/drivers/spi/spi-s3c24xx.c
b/drivers/spi/spi-s3c24xx.c
index
d39589d
..
0dc32a1
100644
(file)
--- a/
drivers/spi/spi-s3c24xx.c
+++ b/
drivers/spi/spi-s3c24xx.c
@@
-524,7
+524,7
@@
static int s3c24xx_spi_probe(struct platform_device *pdev)
hw = spi_master_get_devdata(master);
memset(hw, 0, sizeof(struct s3c24xx_spi));
- hw->master =
spi_master_get(master)
;
+ hw->master =
master
;
hw->pdata = pdata = dev_get_platdata(&pdev->dev);
hw->dev = &pdev->dev;