From 1c741213bab1d3a207756e24ecf2d3322f9451da Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 9 May 2011 10:47:14 -0700 Subject: [PATCH] --- yaml --- r: 249416 b: refs/heads/master c: 7fb71adc357885c9ea9971efec3bb2a527b54364 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/keucr/common.h | 2 ++ trunk/drivers/staging/keucr/ms.c | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1ee027b8b29c..bdbd274dda0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8aba9d5d6c0d9809798967b9aac293690233b6d +refs/heads/master: 7fb71adc357885c9ea9971efec3bb2a527b54364 diff --git a/trunk/drivers/staging/keucr/common.h b/trunk/drivers/staging/keucr/common.h index b87dc7a8901d..cf347ccd6a6e 100644 --- a/trunk/drivers/staging/keucr/common.h +++ b/trunk/drivers/staging/keucr/common.h @@ -9,5 +9,7 @@ typedef u16 *PWORD; typedef u32 DWORD; typedef u32 *PDWORD; +#define BYTE_MASK 0xff + #endif diff --git a/trunk/drivers/staging/keucr/ms.c b/trunk/drivers/staging/keucr/ms.c index a7137217cf86..52fe0a6eba28 100644 --- a/trunk/drivers/staging/keucr/ms.c +++ b/trunk/drivers/staging/keucr/ms.c @@ -25,10 +25,10 @@ int MS_ReaderCopyBlock(struct us_data *us, WORD oldphy, WORD newphy, WORD PhyBlo bcb->CDB[1] = 0x08; bcb->CDB[4] = (BYTE)(oldphy); bcb->CDB[3] = (BYTE)(oldphy>>8); - bcb->CDB[2] = (BYTE)(oldphy>>16); + bcb->CDB[2] = 0; /* (BYTE)(oldphy>>16) */ bcb->CDB[7] = (BYTE)(newphy); bcb->CDB[6] = (BYTE)(newphy>>8); - bcb->CDB[5] = (BYTE)(newphy>>16); + bcb->CDB[5] = 0; /* (BYTE)(newphy>>16) */ bcb->CDB[9] = (BYTE)(PhyBlockAddr); bcb->CDB[8] = (BYTE)(PhyBlockAddr>>8); bcb->CDB[10] = PageNum; @@ -786,7 +786,8 @@ int MS_LibErrorPhyBlock(struct us_data *us, WORD phyblk) MS_LibSetAcquiredErrorBlock(us, phyblk); if (MS_LibIsWritable(us)) - return MS_LibOverwriteExtra(us, phyblk, 0, (BYTE)(~MS_REG_OVR_BKST)); + return MS_LibOverwriteExtra(us, phyblk, 0, + (BYTE)(~MS_REG_OVR_BKST & BYTE_MASK)); return MS_STATUS_SUCCESS;