diff options
| author |   Rick Jones <rick.jones2@hp.com> | 2011-11-22 14:06:26 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-11-29 00:30:12 -0500 |
| commit | 8ac72d167198f52cba8637cc9bec89339b8e4e64 (patch) | |
| tree | 52bca61d76350e60c5624867ba229791cbd0a0ec /drivers/net/ethernet/realtek/r8169.c | |
| parent | tcp: do not scale TSO segment size with reordering degree (diff) | |
| download | linux-dev-8ac72d167198f52cba8637cc9bec89339b8e4e64.tar.xz linux-dev-8ac72d167198f52cba8637cc9bec89339b8e4e64.zip | |
corral some wayward N/A fw_version dust bunnies
Round-up some wayward "N/A" fw_version dust bunnies as part of that
clean-up.
Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index f7bc310f5185..e5a6d8e70502 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1405,8 +1405,9 @@ static void rtl8169_get_drvinfo(struct net_device *dev, strlcpy(info->version, RTL8169_VERSION, sizeof(info->version)); strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info)); BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version)); - strlcpy(info->fw_version, IS_ERR_OR_NULL(rtl_fw) ? "N/A" : - rtl_fw->version, sizeof(info->fw_version)); + if (!IS_ERR_OR_NULL(rtl_fw)) + strlcpy(info->fw_version, rtl_fw->version, + sizeof(info->fw_version)); } static int rtl8169_get_regs_len(struct net_device *dev) |