diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/scsi/bnx2fc/bnx2fc_els.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/scsi/bnx2fc/bnx2fc_els.c')
| -rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_els.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c index 7a11a255157..52c358427ce 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_els.c +++ b/drivers/scsi/bnx2fc/bnx2fc_els.c | |||
| @@ -397,7 +397,7 @@ void bnx2fc_process_els_compl(struct bnx2fc_cmd *els_req, | |||
| 397 | &els_req->req_flags)) { | 397 | &els_req->req_flags)) { |
| 398 | BNX2FC_ELS_DBG("Timer context finished processing this " | 398 | BNX2FC_ELS_DBG("Timer context finished processing this " |
| 399 | "els - 0x%x\n", els_req->xid); | 399 | "els - 0x%x\n", els_req->xid); |
| 400 | /* This IO doesnt receive cleanup completion */ | 400 | /* This IO doesn't receive cleanup completion */ |
| 401 | kref_put(&els_req->refcount, bnx2fc_cmd_release); | 401 | kref_put(&els_req->refcount, bnx2fc_cmd_release); |
| 402 | return; | 402 | return; |
| 403 | } | 403 | } |