From bdd470db09a9a2fdcc9b77fdcdb00f776864860f Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 29 Mar 2012 21:52:20 +0300 Subject: [PATCH] --- yaml --- r: 304293 b: refs/heads/master c: 2471ec5895b2e3eeb55f4386a793123c8a5bf88a h: refs/heads/master i: 304291: eccbe2e367e412ac7db3d1779d2922535510dbeb v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts5139/ms.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d585f2468b05..fba6c509235b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc44de0097b6eb05e1feb63d045bdafb8120784d +refs/heads/master: 2471ec5895b2e3eeb55f4386a793123c8a5bf88a diff --git a/trunk/drivers/staging/rts5139/ms.c b/trunk/drivers/staging/rts5139/ms.c index b0e9071c8e52..02aad2d242cb 100644 --- a/trunk/drivers/staging/rts5139/ms.c +++ b/trunk/drivers/staging/rts5139/ms.c @@ -3864,7 +3864,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip, log_blk = (u16) (start_sector >> ms_card->block_shift); start_page = (u8) (start_sector & ms_card->page_off); - for (seg_no = 0; seg_no < sizeof(ms_start_idx) / 2; seg_no++) { + for (seg_no = 0; seg_no < ARRAY_SIZE(ms_start_idx) - 1; seg_no++) { if (log_blk < ms_start_idx[seg_no + 1]) break; } @@ -4020,7 +4020,8 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip, log_blk++; - for (seg_no = 0; seg_no < sizeof(ms_start_idx) / 2; seg_no++) { + for (seg_no = 0; seg_no < ARRAY_SIZE(ms_start_idx) - 1; + seg_no++) { if (log_blk < ms_start_idx[seg_no + 1]) break; }