From 3a8c8bbf338f2affedcc1621d795685e23287fcb Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 19 May 2008 12:17:39 +0200 Subject: [PATCH] --- yaml --- r: 101497 b: refs/heads/master c: b21417820f8f659a6b73cc937ab39bf77d350ce6 h: refs/heads/master i: 101495: b674854de9b3eab24888b48498ec2dc592a1d307 v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_fsf.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ceb37842e919..c48c5c761930 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dfe1cc36be27040144238d30da05053db71beb1 +refs/heads/master: b21417820f8f659a6b73cc937ab39bf77d350ce6 diff --git a/trunk/drivers/s390/scsi/zfcp_fsf.c b/trunk/drivers/s390/scsi/zfcp_fsf.c index b344e8a72f1f..2f27d03e61c2 100644 --- a/trunk/drivers/s390/scsi/zfcp_fsf.c +++ b/trunk/drivers/s390/scsi/zfcp_fsf.c @@ -712,7 +712,7 @@ zfcp_fsf_status_read(struct zfcp_adapter *adapter, int req_flags) struct fsf_status_read_buffer *status_buffer; unsigned long lock_flags; volatile struct qdio_buffer_element *sbale; - int retval = 0; + int retval; /* setup new FSF request */ retval = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS, @@ -731,12 +731,11 @@ zfcp_fsf_status_read(struct zfcp_adapter *adapter, int req_flags) sbale[2].flags |= SBAL_FLAGS_LAST_ENTRY; fsf_req->sbale_curr = 2; + retval = -ENOMEM; status_buffer = mempool_alloc(adapter->pool.data_status_read, GFP_ATOMIC); - if (!status_buffer) { - ZFCP_LOG_NORMAL("bug: could not get some buffer\n"); + if (!status_buffer) goto failed_buf; - } memset(status_buffer, 0, sizeof (struct fsf_status_read_buffer)); fsf_req->data = (unsigned long) status_buffer;