2712e761f09fa36d4d009adc37ba2688592661ed
[15.05/openwrt.git] / target / linux / lantiq / patches-3.10 / 0104-nand.patch
1 Index: linux-3.10.34/drivers/mtd/nand/xway_nand.c
2 ===================================================================
3 --- linux-3.10.34.orig/drivers/mtd/nand/xway_nand.c     2014-03-28 11:51:49.790953906 +0000
4 +++ linux-3.10.34/drivers/mtd/nand/xway_nand.c  2014-03-28 15:45:08.196369790 +0000
5 @@ -80,13 +80,16 @@
6  
7  static void xway_select_chip(struct mtd_info *mtd, int chip)
8  {
9 +       static unsigned long csflags;
10  
11         switch (chip) {
12         case -1:
13                 ltq_ebu_w32_mask(NAND_CON_CE, 0, EBU_NAND_CON);
14                 ltq_ebu_w32_mask(NAND_CON_NANDM, 0, EBU_NAND_CON);
15 +               spin_unlock_irqrestore(&ebu_lock, csflags);
16                 break;
17         case 0:
18 +               spin_lock_irqsave(&ebu_lock, csflags);
19                 ltq_ebu_w32_mask(0, NAND_CON_NANDM, EBU_NAND_CON);
20                 ltq_ebu_w32_mask(0, NAND_CON_CE, EBU_NAND_CON);
21                 break;