projects
/
firefly-linux-kernel-4.4.55.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/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
amd
/
ni65.c
diff --git
a/drivers/net/ethernet/amd/ni65.c
b/drivers/net/ethernet/amd/ni65.c
index 013b651085369c83e20db7b4c5f868c382c5dccd..26fc0ce0faa3299929895e47b5a4fe5288687630 100644
(file)
--- a/
drivers/net/ethernet/amd/ni65.c
+++ b/
drivers/net/ethernet/amd/ni65.c
@@
-1238,7
+1238,7
@@
MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");
int __init init_module(void)
{
dev_ni65 = ni65_probe(-1);
- return
IS_ERR(dev_ni65) ? PTR_ERR(dev_ni65) : 0
;
+ return
PTR_RET(dev_ni65)
;
}
void __exit cleanup_module(void)