diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-06 20:38:16 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-06 20:38:16 +0100 |
commit | 74f5ec29ae93aa42c49f4285c20c457afe937881 (patch) | |
tree | 2f9fe3e3f7bcd91769b0030cead82e1986e0dd32 /drivers/net | |
parent | Fix io ordering problems in e100 (diff) | |
parent | [PATCH] chelsio: fix kmalloc failure in t1_espi_create (diff) | |
download | linux-74f5ec29ae93aa42c49f4285c20c457afe937881.tar.xz linux-74f5ec29ae93aa42c49f4285c20c457afe937881.zip |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/chelsio/espi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c index 230642571c92..e824acaf188a 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; |