aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index df70657260dd..92ae8d3de39b 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -79,6 +79,7 @@
79#include <linux/tcp.h> 79#include <linux/tcp.h>
80#include <linux/uaccess.h> 80#include <linux/uaccess.h>
81#include <linux/io.h> 81#include <linux/io.h>
82#include <linux/slab.h>
82#include <net/tcp.h> 83#include <net/tcp.h>
83 84
84#include <asm/system.h> 85#include <asm/system.h>
@@ -5819,10 +5820,8 @@ static void s2io_vpd_read(struct s2io_nic *nic)
5819 } 5820 }
5820 } 5821 }
5821 5822
5822 if ((!fail) && (vpd_data[1] < VPD_STRING_LEN)) { 5823 if ((!fail) && (vpd_data[1] < VPD_STRING_LEN))
5823 memset(nic->product_name, 0, vpd_data[1]);
5824 memcpy(nic->product_name, &vpd_data[3], vpd_data[1]); 5824 memcpy(nic->product_name, &vpd_data[3], vpd_data[1]);
5825 }
5826 kfree(vpd_data); 5825 kfree(vpd_data);
5827 swstats->mem_freed += 256; 5826 swstats->mem_freed += 256;
5828} 5827}