From 57f6ce555bdb4d51f54aae04ac77d652bae408b5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 30 Jan 2013 10:07:31 +0300 Subject: [PATCH] --- yaml --- r: 360217 b: refs/heads/master c: 50e9291578886099888b8169459c6f97626ccbfc h: refs/heads/master i: 360215: 2aadb650c5774a4accb44bff121a9e761baf6315 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_mbx.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4367320e5376..037dfae6627c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c237c5f6d5c62724ccd82aecdcd1fd9bd71dc75 +refs/heads/master: 50e9291578886099888b8169459c6f97626ccbfc diff --git a/trunk/drivers/scsi/qla4xxx/ql4_mbx.c b/trunk/drivers/scsi/qla4xxx/ql4_mbx.c index 81e738d61ec0..160d33697216 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_mbx.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_mbx.c @@ -1420,10 +1420,8 @@ int qla4xxx_get_chap(struct scsi_qla_host *ha, char *username, char *password, dma_addr_t chap_dma; chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma); - if (chap_table == NULL) { - ret = -ENOMEM; - goto exit_get_chap; - } + if (chap_table == NULL) + return -ENOMEM; chap_size = sizeof(struct ql4_chap_table); memset(chap_table, 0, chap_size);