Signed-off-by: Matthias Beyer <m...@beyermatthias.de>
---
 drivers/staging/bcm/nvm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index c38c803..0d197c0 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -1042,6 +1042,8 @@ static int bulk_read_complete_sector(struct 
bcm_mini_adapter *ad,
 {
        unsigned int j;
        int bulk_read_stat;
+       FP_FLASH_WRITE_STATUS writef =
+               ad->fpFlashWriteWithStatusCheck;
 
        for (i = 0; i < ad->uiSectorSize; i += MAX_RW_SIZE) {
                bulk_read_stat = BeceemFlashBulkRead(ad,
@@ -1054,14 +1056,14 @@ 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]) &&
-                                   (STATUS_SUCCESS != 
(*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i + j, &tmpbuff[i+j]))) {
+                               if ((read_bk[j] != tmpbuff[i + j]) &&
+                                   (STATUS_SUCCESS != (*writef)(ad, partoff + 
i + j, &tmpbuff[i + j]))) {
                                        return STATUS_FAILURE;
                                }
                        }
                } else {
                        if ((memcmp(read_bk, &tmpbuff[i], MAX_RW_SIZE)) &&
-                           ((STATUS_SUCCESS != 
(*ad->fpFlashWriteWithStatusCheck)(ad, partoff + i, &tmpbuff[i])))) {
+                           (STATUS_SUCCESS != (*writef)(ad, partoff + i, 
&tmpbuff[i]))) {
                                return STATUS_FAILURE;
                        }
                }
-- 
2.0.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to