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 branches 'acpi-apei', 'acpi-misc' and 'acpi-processor'
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-npcm-fiu.c
diff --git
a/drivers/spi/spi-npcm-fiu.c
b/drivers/spi/spi-npcm-fiu.c
index
341f7cf
..
1cb9329
100644
(file)
--- a/
drivers/spi/spi-npcm-fiu.c
+++ b/
drivers/spi/spi-npcm-fiu.c
@@
-679,7
+679,7
@@
static int npcm_fiu_probe(struct platform_device *pdev)
struct resource *res;
int id;
- ctrl = spi_alloc_master(dev, sizeof(*fiu));
+ ctrl =
devm_
spi_alloc_master(dev, sizeof(*fiu));
if (!ctrl)
return -ENOMEM;