git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
myri10ge: print MAC and serial number on probe failure
[safe/jmp/linux-2.6]
/
drivers
/
net
/
myri10ge
/
myri10ge.c
diff --git
a/drivers/net/myri10ge/myri10ge.c
b/drivers/net/myri10ge/myri10ge.c
index
5e70180
..
6bb71b6
100644
(file)
--- a/
drivers/net/myri10ge/myri10ge.c
+++ b/
drivers/net/myri10ge/myri10ge.c
@@
-75,7
+75,7
@@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.4.4-1.39
5
"
+#define MYRI10GE_VERSION_STR "1.4.4-1.39
8
"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
@@
-3929,6
+3929,10
@@
abort_with_firmware:
myri10ge_dummy_rdma(mgp, 0);
abort_with_ioremap:
myri10ge_dummy_rdma(mgp, 0);
abort_with_ioremap:
+ if (mgp->mac_addr_string != NULL)
+ dev_err(&pdev->dev,
+ "myri10ge_probe() failed: MAC=%s, SN=%ld\n",
+ mgp->mac_addr_string, mgp->serial_number);
iounmap(mgp->sram);
abort_with_mtrr:
iounmap(mgp->sram);
abort_with_mtrr: