From 50206f5ed8c77ce699feec6aa3385e60fd2f76bc Mon Sep 17 00:00:00 2001 From: Rick Jones Date: Tue, 22 Nov 2011 14:06:26 +0000 Subject: [PATCH] --- yaml --- r: 278268 b: refs/heads/master c: 8ac72d167198f52cba8637cc9bec89339b8e4e64 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/neterion/s2io.c | 1 - trunk/drivers/net/ethernet/realtek/r8169.c | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cba42084794a..348a0fb8561d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b5a5c0dbb11dcff4e1b0f1ef87a723197948ed4 +refs/heads/master: 8ac72d167198f52cba8637cc9bec89339b8e4e64 diff --git a/trunk/drivers/net/ethernet/neterion/s2io.c b/trunk/drivers/net/ethernet/neterion/s2io.c index 76ae47627200..97f63e12d86e 100644 --- a/trunk/drivers/net/ethernet/neterion/s2io.c +++ b/trunk/drivers/net/ethernet/neterion/s2io.c @@ -5393,7 +5393,6 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev, strlcpy(info->driver, s2io_driver_name, sizeof(info->driver)); strlcpy(info->version, s2io_driver_version, sizeof(info->version)); - strlcpy(info->fw_version, "", sizeof(info->fw_version)); strlcpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info)); info->regdump_len = XENA_REG_SPACE; info->eedump_len = XENA_EEPROM_SPACE; diff --git a/trunk/drivers/net/ethernet/realtek/r8169.c b/trunk/drivers/net/ethernet/realtek/r8169.c index f7bc310f5185..e5a6d8e70502 100644 --- a/trunk/drivers/net/ethernet/realtek/r8169.c +++ b/trunk/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)