hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Staging: bcm: nvm.c: Removed indentation level by concatenating nested if statements 

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Beyer 2014-07-20 15:14:12 +02:00 committed by Greg Kroah-Hartman
parent f3ebe23705
commit aabaf67f6f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/bcm/nvm.c
View File

@ -1054,17 +1054,15 @@ static int bulk_read_complete_sector(struct bcm_mini_adapter *ad,
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;
}
if ((read_bk[j] != tmpbuff[i+j]) &&
(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;
}
if ((memcmp(read_bk, &tmpbuff[i], MAX_RW_SIZE)) &&
((STATUS_SUCCESS != (*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i, &tmpbuff[i])))) {
return STATUS_FAILURE;
}
}
}