diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 09:55:47 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 09:55:47 +0100 |
| commit | b71d4da092801634d04190693a38ca03bdbe2505 (patch) | |
| tree | e4adc88ade5832b844768c114b15d4d97253c4d0 /drivers/infiniband | |
| parent | [libata] Print out SATA speed, if link is up (diff) | |
| parent | Linux v2.6.15-rc3 (diff) | |
| download | linux-b71d4da092801634d04190693a38ca03bdbe2505.tar.xz linux-b71d4da092801634d04190693a38ca03bdbe2505.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/core/mad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index 41d6b4017acb..d393b504bf26 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -355,9 +355,9 @@ error4: spin_unlock_irqrestore(&port_priv->reg_lock, flags); kfree(reg_req); error3: - kfree(mad_agent_priv); -error2: ib_dereg_mr(mad_agent_priv->agent.mr); +error2: + kfree(mad_agent_priv); error1: return ret; } |