<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=Content-Type content="text/html; charset=us-ascii">
<META content="MSHTML 6.00.6000.16587" name=GENERATOR></HEAD>
<BODY>
<DIV><FONT face=Arial size=2>Index:
Q:/projinf2/trunk/hw/mlx4/kernel/bus/core/device.c<BR>===================================================================<BR>---
Q:/projinf2/trunk/hw/mlx4/kernel/bus/core/device.c (revision 3919)<BR>+++
Q:/projinf2/trunk/hw/mlx4/kernel/bus/core/device.c (revision 3920)<BR>@@
-332,6 +332,11 @@<BR> struct ib_client_data *context,
*tmp;<BR> unsigned long
flags;<BR> <BR>+ if(device->reg_state != IB_DEV_REGISTERED)
{<BR>+ ASSERT(FALSE);<BR>+ return;<BR>+ }<BR>+<BR> mutex_lock(&device_mutex);<BR> <BR> list_for_each_entry_reverse(client,
&client_list, list, struct ib_client)<BR>@@ -340,8 +345,14
@@<BR> <BR> list_del(&device->core_list);<BR> <BR>- kfree(device->gid_tbl_len);<BR>- kfree(device->pkey_tbl_len);<BR>+ if
(device->gid_tbl_len)
{<BR>+ kfree(device->gid_tbl_len);<BR>+ device->gid_tbl_len
= NULL;<BR>+ }<BR>+ if(device->pkey_tbl_len)
{<BR>+ kfree(device->pkey_tbl_len);<BR>+ device->pkey_tbl_len
=
NULL;<BR>+ }<BR> <BR> mutex_unlock(&device_mutex);<BR> <BR>Index:
Q:/projinf2/trunk/hw/mlx4/kernel/bus/ib/main.c<BR>===================================================================<BR>---
Q:/projinf2/trunk/hw/mlx4/kernel/bus/ib/main.c (revision 3919)<BR>+++
Q:/projinf2/trunk/hw/mlx4/kernel/bus/ib/main.c (revision 3920)<BR>@@ -621,8
+621,10 @@<BR> struct mlx4_ib_dev *ibdev =
ibdev_ptr;<BR> int p;<BR> <BR>- if
(mlx4_is_livefish(ibdev->dev))<BR>+ if (mlx4_is_livefish(ibdev->dev))
{<BR>+ ib_unregister_device(&ibdev->ib_dev);<BR> goto
dealloc_dev;<BR>+ }<BR> <BR> for (p = 1; p <=
dev->caps.num_ports; ++p)<BR> mlx4_CLOSE_PORT(dev,
p);<BR>Index:
Q:/projinf2/trunk/hw/mlx4/kernel/hca/drv.c<BR>===================================================================<BR>---
Q:/projinf2/trunk/hw/mlx4/kernel/hca/drv.c (revision 3919)<BR>+++
Q:/projinf2/trunk/hw/mlx4/kernel/hca/drv.c (revision 3920)<BR>@@ -713,7
+713,7 @@<BR> <BR> HCA_ENTER( HCA_DBG_PNP
);<BR> <BR>- HCA_PRINT(TRACE_LEVEL_INFORMATION, HCA_DBG_PNP,
("EvtReleaseHardware: FdoData=0x%p\n",
p_fdo));<BR>+ HCA_PRINT(TRACE_LEVEL_INFORMATION, HCA_DBG_PNP,
("EvtDeviceReleaseHardware: FdoData=0x%p\n",
p_fdo));<BR> <BR> // release IBBUS
resources<BR> __hca_release_resources(Device);<BR></FONT></DIV></BODY></HTML>