diff options
Diffstat (limited to 'drivers/staging/rts5208/ms.c')
| -rw-r--r-- | drivers/staging/rts5208/ms.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c index db8e22166db8..b4612fb615f6 100644 --- a/drivers/staging/rts5208/ms.c +++ b/drivers/staging/rts5208/ms.c @@ -862,8 +862,8 @@ static int ms_read_attribute_info(struct rtsx_chip *chip) 0, 0, buf, 64 * 512); if (retval == STATUS_SUCCESS) break; - else - rtsx_clear_ms_error(chip); + + rtsx_clear_ms_error(chip); } if (retval != STATUS_SUCCESS) { kfree(buf); @@ -2599,9 +2599,9 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, if (count > sector_cnt) { if (mode_2k) - ms_card->seq_mode |= MODE_2K_SEQ; + ms_card->seq_mode = MODE_2K_SEQ; else - ms_card->seq_mode |= MODE_512_SEQ; + ms_card->seq_mode = MODE_512_SEQ; } } else { count = sector_cnt; @@ -2713,6 +2713,7 @@ static int mspro_read_format_progress(struct rtsx_chip *chip, ms_card->progress = 0; } else { u64 ulltmp = (u64)cur_progress * (u64)65535; + do_div(ulltmp, total_progress); ms_card->progress = (u16)ulltmp; } @@ -2776,8 +2777,6 @@ void mspro_polling_format_status(struct rtsx_chip *chip) break; } } - - return; } int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip, |