git.samba.org
/
sfrench
/
cifs-2.6.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/topic/altera', 'spi/topic/at79', 'spi/topic/bcm...
[sfrench/cifs-2.6.git]
/
drivers
/
spi
/
spi-bcm63xx-hsspi.c
diff --git
a/drivers/spi/spi-bcm63xx-hsspi.c
b/drivers/spi/spi-bcm63xx-hsspi.c
index 475a79015aa6752e3f77a8cf92ec769af0873778..cbcba614b253375d024cf45f03408fa53337d8f5 100644
(file)
--- a/
drivers/spi/spi-bcm63xx-hsspi.c
+++ b/
drivers/spi/spi-bcm63xx-hsspi.c
@@
-338,8
+338,8
@@
static int bcm63xx_hsspi_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
- dev_err(dev, "no irq
\n"
);
- return
-ENXIO
;
+ dev_err(dev, "no irq
: %d\n", irq
);
+ return
irq
;
}
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);