Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik
2006-03-06 14:38:16 -05:00
6 changed files with 23 additions and 20 deletions
+1 -3
View File
@@ -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;