Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / ft1000 / ft1000-pcmcia / ft1000_hw.c

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 3fd499f09bcafc745ce259c04c208a578b688c67..29d0a72f0d65d7d0c999821612c5b8c29343787f 100644 (file)
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -2082,11 +2082,12 @@ static void ft1000_get_drvinfo(struct net_device *dev,
        struct ft1000_info *ft_info;
        ft_info = netdev_priv(dev);
 
-       snprintf(info->driver, 32, "ft1000");
-       snprintf(info->bus_info, ETHTOOL_BUSINFO_LEN, "PCMCIA 0x%lx",
+       strlcpy(info->driver, "ft1000", sizeof(info->driver));
+       snprintf(info->bus_info, sizeof(info->bus_info), "PCMCIA 0x%lx",
                 dev->base_addr);
-       snprintf(info->fw_version, 32, "%d.%d.%d.%d", ft_info->DspVer[0],
-                ft_info->DspVer[1], ft_info->DspVer[2], ft_info->DspVer[3]);
+       snprintf(info->fw_version, sizeof(info->fw_version), "%d.%d.%d.%d",
+                ft_info->DspVer[0], ft_info->DspVer[1], ft_info->DspVer[2],
+                ft_info->DspVer[3]);
 }
 
 static u32 ft1000_get_link(struct net_device *dev)