--- cfi_cmdset_0001.c.org       2006-09-21 15:58:03.000000000 -0400
+++ cfi_cmdset_0001.c   2006-09-22 09:16:21.000000000 -0400
@@ -2224,6 +2224,8 @@
                case FL_CFI_QUERY:
                case FL_JEDEC_QUERY:
                        if (chip->oldstate == FL_READY) {
+                               /* place the chip in a known state before suspend */
+                               map_write(map, CMD(0xFF), cfi->chips[i].start);
                                chip->oldstate = chip->state;
                                chip->state = FL_PM_SUSPENDED;
                                /* No need to wake_up() on this state change -