Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 62722
b: refs/heads/master
c: aa551da
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Carstens authored and James Bottomley committed Jul 18, 2007
1 parent 7b268ea commit f1c3986
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d661327a7578c3fca43db78f32e92a902237e7a
refs/heads/master: aa551daf5cc6fb6c6e09bb993737f9cd46dc7145
9 changes: 3 additions & 6 deletions trunk/drivers/s390/scsi/zfcp_aux.c
Original file line number Diff line number Diff line change
Expand Up @@ -1526,15 +1526,12 @@ zfcp_gid_pn_buffers_alloc(struct zfcp_gid_pn_data **gid_pn, mempool_t *pool)
* zfcp_gid_pn_buffers_free - free buffers for GID_PN nameserver request
* @gid_pn: pointer to struct zfcp_gid_pn_data which has to be freed
*/
static void
zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn)
static void zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn)
{
if ((gid_pn->ct.pool != 0))
if (gid_pn->ct.pool)
mempool_free(gid_pn, gid_pn->ct.pool);
else
kfree(gid_pn);

return;
kfree(gid_pn);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/s390/scsi/zfcp_fsf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1930,7 +1930,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
skip_fsfstatus:
send_els->status = retval;

if (send_els->handler != 0)
if (send_els->handler)
send_els->handler(send_els->handler_data);

return retval;
Expand Down

0 comments on commit f1c3986

Please sign in to comment.