Commit 43823c5c authored by Tokunori Ikegami's avatar Tokunori Ikegami Committed by Miquel Raynal
Browse files
parent cccea941
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
			       unsigned long addr, map_word *expected)
{
	struct cfi_private *cfi = map->fldrv_priv;
	map_word d, t;
	map_word oldd, curd;
	int ret;

	if (cfi_use_status_reg(cfi)) {
@@ -845,20 +845,20 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
		 */
		cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi,
				 cfi->device_type, NULL);
		t = map_read(map, addr);
		curd = map_read(map, addr);

		return map_word_andequal(map, t, ready, ready);
		return map_word_andequal(map, curd, ready, ready);
	}

	d = map_read(map, addr);
	t = map_read(map, addr);
	oldd = map_read(map, addr);
	curd = map_read(map, addr);

	ret = map_word_equal(map, d, t);
	ret = map_word_equal(map, oldd, curd);

	if (!ret || !expected)
		return ret;

	return map_word_equal(map, t, *expected);
	return map_word_equal(map, curd, *expected);
}

static int __xipram chip_good(struct map_info *map, struct flchip *chip,