From 1e6daae52f26e33b73b39d3e3e76a240837d648e Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Fri, 23 Oct 2009 16:02:42 -0400 Subject: [PATCH] --- yaml --- r: 176935 b: refs/heads/master c: c9f7ec30848637989b85a9f0ac5d4aa33c49916e h: refs/heads/master i: 176933: 6d238b2335f5406e0b6dc441d42f12c1c31b078e 176931: dc58325c54f7117ba25b1c51c4c98a10084eb129 176927: f10b7e68d07df21204cf92fc7b9eef22b59bbed7 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_cmdset_0001.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 75501da76d32..d2c9c022f16e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f369c7ec94da63fc68cf7fa43516414888865c14 +refs/heads/master: c9f7ec30848637989b85a9f0ac5d4aa33c49916e diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c index e7563a9872d0..d923a2d88f9c 100644 --- a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c @@ -2564,6 +2564,7 @@ static int cfi_intelext_reset(struct mtd_info *mtd) if (!ret) { map_write(map, CMD(0xff), chip->start); chip->state = FL_SHUTDOWN; + put_chip(map, chip, chip->start); } spin_unlock(chip->mutex); }