summaryrefslogtreecommitdiff
path: root/drivers/net/chelsio
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-06 14:38:16 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-06 14:38:16 -0500
commit74f5ec29ae93aa42c49f4285c20c457afe937881 (patch)
tree2f9fe3e3f7bcd91769b0030cead82e1986e0dd32 /drivers/net/chelsio
parentad8c48ad3bbef078616ed4d2652d362dfd962f09 (diff)
parent2d66806d740eeb410aa785bd7fba3bd24bb082c1 (diff)
downloadlinux-3.10-74f5ec29ae93aa42c49f4285c20c457afe937881.tar.gz
linux-3.10-74f5ec29ae93aa42c49f4285c20c457afe937881.tar.bz2
linux-3.10-74f5ec29ae93aa42c49f4285c20c457afe937881.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/chelsio')
-rw-r--r--drivers/net/chelsio/espi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c
index 230642571c9..e824acaf188 100644
--- a/drivers/net/chelsio/espi.c
+++ b/drivers/net/chelsio/espi.c
@@ -296,9 +296,7 @@ void t1_espi_destroy(struct peespi *espi)
struct peespi *t1_espi_create(adapter_t *adapter)
{
- struct peespi *espi = kmalloc(sizeof(*espi), GFP_KERNEL);
-
- memset(espi, 0, sizeof(*espi));
+ struct peespi *espi = kzalloc(sizeof(*espi), GFP_KERNEL);
if (espi)
espi->adapter = adapter;