lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../linux-2.6/

Browse Source 
Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2006-06-28 14:06:39 -04:00
parent dc6a78f1af a39727f212
commit f28e71617d
1119 changed files with 51327 additions and 19522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/message/fusion/mptfc.c
View File

@@ -305,10 +305,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
}
out:
if (pp0_array)
kfree(pp0_array);
if (p0_array)
kfree(p0_array);
kfree(pp0_array);
kfree(p0_array);
return rc;
}