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
/
ethernet
/
ti
/
am65-cpsw-nuss.c
diff --git
a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 2517ffba81788e00a2c8732cd2138337b820a3d4..88f52a2f85b37dbce467a5c7dae940d68de493bf 100644
(file)
--- a/
drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/
drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@
-1895,8
+1895,9
@@
static int am65_cpsw_nuss_probe(struct platform_device *pdev)
ale_params.nu_switch_ale = true;
common->ale = cpsw_ale_create(&ale_params);
- if (
!common->ale
) {
+ if (
IS_ERR(common->ale)
) {
dev_err(dev, "error initializing ale engine\n");
+ ret = PTR_ERR(common->ale);
goto err_of_clear;
}