From 2e2b5b732153f3ace7a6babfcffc585eb00d239e Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Fri, 25 Aug 2006 11:24:28 -0700 Subject: [PATCH] --- yaml --- r: 34293 b: refs/heads/master c: 8e280d94e29af67035637fb957daba7ae0d23583 h: refs/heads/master i: 34291: fcae99ee83466e00e1c05cd68560f606c7308cfd v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b9ee6549a79a..df6ae38a6510 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c27fef26271d352b5546c33239edeb0dcb4fc0cc +refs/heads/master: 8e280d94e29af67035637fb957daba7ae0d23583 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c index 414cdd1d80a6..c63de8f0fa9e 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c @@ -240,7 +240,11 @@ static int init_chip_first(struct ipath_devdata *dd, "only supports %u\n", ipath_cfgports, dd->ipath_portcnt); } - dd->ipath_pd = kzalloc(sizeof(*dd->ipath_pd) * dd->ipath_cfgports, + /* + * Allocate full portcnt array, rather than just cfgports, because + * cleanup iterates across all possible ports. + */ + dd->ipath_pd = kzalloc(sizeof(*dd->ipath_pd) * dd->ipath_portcnt, GFP_KERNEL); if (!dd->ipath_pd) {