summaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/nvm.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index edbd0f9b6f9..c38c80347c1 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -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;
}
}
}