diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-06 12:10:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-06 12:10:42 -0800 |
| commit | b6f57864eeacd556013c4b40917d50d7c8c38f8c (patch) | |
| tree | f06af675059a506bfb0b70489796f97f13214a2f /drivers/net/chelsio/espi.c | |
| parent | 264132bc62fe071d0ff378c1103bae9d33212f10 (diff) | |
| parent | 2d66806d740eeb410aa785bd7fba3bd24bb082c1 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] chelsio: fix kmalloc failure in t1_espi_create
Merge branch 'master'
s2io: set_multicast_list bug
Diffstat (limited to 'drivers/net/chelsio/espi.c')
| -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 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; |