diff options
| author | Matthias Beyer | 2014-07-20 15:14:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-07-21 21:30:42 +0200 |
| commit | f3ebe23705515c6a032bb8386de19b4ee7863a50 (patch) | |
| tree | 834e144a0a347af4fd2cbef8ddbcff2a7c62dc91 | |
| parent | Staging: bcm: nvm.c: Outsourced chunk of code into function (diff) | |
| download | kernel-qcow2-linux-f3ebe23705515c6a032bb8386de19b4ee7863a50.tar.gz kernel-qcow2-linux-f3ebe23705515c6a032bb8386de19b4ee7863a50.tar.xz kernel-qcow2-linux-f3ebe23705515c6a032bb8386de19b4ee7863a50.zip | |
Staging: bcm: nvm.c: Removed indentation level by using continue statement
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/bcm/nvm.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index 4aa195c791e9..edbd0f9b6f97 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c @@ -1049,22 +1049,23 @@ static int bulk_read_complete_sector(struct bcm_mini_adapter *ad, offset + i, MAX_RW_SIZE); - if (bulk_read_stat == STATUS_SUCCESS) { - if (ad->ulFlashWriteSize == 1) { - for (j = 0; j < 16; j++) { - if (read_bk[j] != tmpbuff[i+j]) { - if (STATUS_SUCCESS != (*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i + j, &tmpbuff[i+j])) { - return STATUS_FAILURE; - } - } - } - } else { - if (memcmp(read_bk, &tmpbuff[i], MAX_RW_SIZE)) { - if (STATUS_SUCCESS != (*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i, &tmpbuff[i])) { + if (bulk_read_stat != STATUS_SUCCESS) + continue; + + if (ad->ulFlashWriteSize == 1) { + for (j = 0; j < 16; j++) { + if (read_bk[j] != tmpbuff[i+j]) { + if (STATUS_SUCCESS != (*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i + j, &tmpbuff[i+j])) { return STATUS_FAILURE; } } } + } else { + if (memcmp(read_bk, &tmpbuff[i], MAX_RW_SIZE)) { + if (STATUS_SUCCESS != (*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i, &tmpbuff[i])) { + return STATUS_FAILURE; + } + } } } |