diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-16 22:24:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-16 22:24:29 -0500 |
| commit | 93d62ef97db5a5a5683237c8cf43fbf040475b8e (patch) | |
| tree | 3f96c0132ba381392ad55f6385a36e71567c0061 /drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | |
| parent | 919d9db9521862d01712d9be25cd6ebfcc353eed (diff) | |
| parent | 8fdb1a09e1568062f6c434e3e828630950b7e16a (diff) | |
Merge branch 'amd-xgbe'
Tom Lendacky says:
====================
amd-xgbe: AMD XGBE driver updates 2015-01-16
The following series of patches includes functional updates to the
driver as well as some trivial changes.
- Fix checks/warnings from checkpatch in the amd-xgbe driver
- Fix checks/warnings from checkpatch in the amd-xgbe-phy driver
- Add a check to be sure that the amd-xgbe driver is using the
amd-xgbe-phy driver
- Use a saved control register value when bringing the PCS out of
suspend
- Clear all device state during a device restart
- Simplify the Rx descriptor ring tracking
- Remove the need for Tx path spinlocks
- Update the auto-negotiation logic to make use of the auto-negotiation
interrupt
- Properly support/advertise the FEC capability of the device
- Use the proper page registers during auto-negotiation extended next
page exchange
- Add ACPI support to the amd-xgbe and amd-xgbe-phy drivers
- Allow platform specific phy settings to be supplied by UEFI
This patch series is based on net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c b/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c index 76479d04b903..2c063b60db4b 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c @@ -328,7 +328,7 @@ void xgbe_debugfs_init(struct xgbe_prv_data *pdata) buf = kasprintf(GFP_KERNEL, "amd-xgbe-%s", pdata->netdev->name); pdata->xgbe_debugfs = debugfs_create_dir(buf, NULL); - if (pdata->xgbe_debugfs == NULL) { + if (!pdata->xgbe_debugfs) { netdev_err(pdata->netdev, "debugfs_create_dir failed\n"); return; } |