X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bcmdrivers%2Fopensource%2Fchar%2Fboard%2Fbcm963xx%2Fimpl1%2Fbcm63xx_flash.c;fp=bcmdrivers%2Fopensource%2Fchar%2Fboard%2Fbcm963xx%2Fimpl1%2Fbcm63xx_flash.c;h=44e88293eafef8ee79172a3ea60e43ce83c1fc5b;hb=172f01faf449acfc67d24d7f10b29f66f9760147;hp=5b90057aff36a7c886b3d276b03e9d0091ec30c8;hpb=6adeba4d92a546ebbadde2562283ee6b984b22c1;p=bcm963xx.git

diff --git a/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_flash.c b/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_flash.c
index 5b90057a..44e88293 100755
--- a/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_flash.c
+++ b/bcmdrivers/opensource/char/board/bcm963xx/impl1/bcm63xx_flash.c
@@ -468,10 +468,7 @@ int kerSysPersistentSet(char *string, int strLen, int offset)
 
     // set string to the memory buffer
     memcpy((pBuf + fInfo.flash_persistent_blk_offset + offset), string, strLen);
-    // USR9108 add two terminating zeros to the end of the string
-    if ( strLen <= fInfo.flash_persistent_length - 2 )
-        memcpy((pBuf + fInfo.flash_persistent_blk_offset + offset + strLen), "\0\0", 2);
-       
+
     if (setSharedBlks(fInfo.flash_persistent_start_blk, 
         (fInfo.flash_persistent_number_blk + fInfo.flash_persistent_start_blk), pBuf) != 0)
         sts = -1;
@@ -818,7 +815,7 @@ int kerSysScratchPadClearAll(void)
     pBuf = pShareBuf + fInfo.flash_scratch_pad_blk_offset;  
     memset(pBuf, 0x00,  fInfo.flash_scratch_pad_length);
     sts = setSharedBlks(fInfo.flash_scratch_pad_start_blk,    
-		(fInfo.flash_scratch_pad_number_blk + fInfo.flash_scratch_pad_start_blk),  pShareBuf);
+		(fInfo.flash_scratch_pad_number_blk + fInfo.flash_scratch_pad_start_blk),  pBuf);
 
    retriedKfree(pShareBuf);