diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-06 14:38:16 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-06 14:38:16 -0500 |
| commit | 74f5ec29ae93aa42c49f4285c20c457afe937881 (patch) | |
| tree | 2f9fe3e3f7bcd91769b0030cead82e1986e0dd32 /drivers/net/chelsio | |
| parent | ad8c48ad3bbef078616ed4d2652d362dfd962f09 (diff) | |
| parent | 2d66806d740eeb410aa785bd7fba3bd24bb082c1 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/chelsio')
| -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) | |||
| 296 | 296 | ||
| 297 | struct peespi *t1_espi_create(adapter_t *adapter) | 297 | struct peespi *t1_espi_create(adapter_t *adapter) |
| 298 | { | 298 | { |
| 299 | struct peespi *espi = kmalloc(sizeof(*espi), GFP_KERNEL); | 299 | struct peespi *espi = kzalloc(sizeof(*espi), GFP_KERNEL); |
| 300 | |||
| 301 | memset(espi, 0, sizeof(*espi)); | ||
| 302 | 300 | ||
| 303 | if (espi) | 301 | if (espi) |
| 304 | espi->adapter = adapter; | 302 | espi->adapter = adapter; |