Skip to content

Update cfi_cmdset_0002.c #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vjiki wants to merge 1 commit into from
Closed

Update cfi_cmdset_0002.c #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions drivers/mtd/chips/cfi_cmdset_0002.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,14 +1625,14 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
continue;
}

if (time_after(jiffies, timeo) && !chip_ready(map, adr)){
if (time_after(jiffies, timeo) && !chip_good(map, adr, datum)){
xip_enable(map, chip, adr);
printk(KERN_WARNING "MTD %s(): software timeout\n", __func__);
xip_disable(map, chip, adr);
break;
}

if (chip_ready(map, adr))
if (chip_good(map, adr, datum))
break;

/* Latency issues. Drop the lock, wait a while and retry */
Expand Down Expand Up @@ -1874,10 +1874,10 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
continue;
}

if (time_after(jiffies, timeo) && !chip_ready(map, adr))
if (time_after(jiffies, timeo) && !chip_good(map, adr, datum))
break;

if (chip_ready(map, adr)) {
if (chip_good(map, adr, datum)) {
xip_enable(map, chip, adr);
goto op_done;
}
Expand Down Expand Up @@ -2288,7 +2288,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
chip->erase_suspended = 0;
}

if (chip_ready(map, adr))
if (chip_good(map, adr, map_word_ff(map)))
break;

if (time_after(jiffies, timeo)) {
Expand Down Expand Up @@ -2377,7 +2377,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
chip->erase_suspended = 0;
}

if (chip_ready(map, adr)) {
if (chip_good(map, adr, map_word_ff(map))) {
xip_enable(map, chip, adr);
break;
}
Expand Down