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 git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
dsa
/
b53
/
b53_srab.c
diff --git
a/drivers/net/dsa/b53/b53_srab.c
b/drivers/net/dsa/b53/b53_srab.c
index 0a1be5259be0c911d6e9fc5f18c3447c2e58bc46..38cd8285ac6793c9bc27013e495941096e36ef21 100644
(file)
--- a/
drivers/net/dsa/b53/b53_srab.c
+++ b/
drivers/net/dsa/b53/b53_srab.c
@@
-609,7
+609,7
@@
static int b53_srab_probe(struct platform_device *pdev)
priv->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->regs))
- return
-ENOMEM
;
+ return
PTR_ERR(priv->regs)
;
dev = b53_switch_alloc(&pdev->dev, &b53_srab_ops, priv);
if (!dev)