target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch

   1 Index: linux-3.1-rc4/drivers/mmc/host/omap.c
   2 ===================================================================
   3 --- linux-3.1-rc4.orig/drivers/mmc/host/omap.c  2011-08-29 06:16:01.000000000 +0200
   4 +++ linux-3.1-rc4/drivers/mmc/host/omap.c       2011-10-27 16:48:04.389148259 +0200
   5 @@ -1456,6 +1456,7 @@ static int __init mmc_omap_probe(struct
   6         host->dma_ch = -1;
   7
   8         host->irq = irq;
   9 +       host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
  10         host->phys_base = host->mem_res->start;
  11         host->virt_base = ioremap(res->start, resource_size(res));
  12         if (!host->virt_base)
  13 @@ -1495,7 +1496,9 @@ static int __init mmc_omap_probe(struct
  14                 }
  15         }
  16
  17 -       host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
  18 +       /* Make sure the detect workqueue was run at least once. */
  19 +       printk(KERN_INFO "OMAP-mmc: waiting for cards...\n");
  20 +       mmc_flush_scheduled_work();
  21
  22         return 0;
  23
  24 Index: linux-3.1-rc4/drivers/mmc/core/core.c
  25 ===================================================================
  26 --- linux-3.1-rc4.orig/drivers/mmc/core/core.c  2011-08-29 06:16:01.000000000 +0200
  27 +++ linux-3.1-rc4/drivers/mmc/core/core.c       2011-10-27 16:48:04.389148259 +0200
  28 @@ -76,12 +76,13 @@ static int mmc_schedule_delayed_work(str
  29  }
  30
  31  /*
  32 - * Internal function. Flush all scheduled work from the MMC work queue.
  33 + * Flush all scheduled work from the MMC work queue.
  34   */
  35 -static void mmc_flush_scheduled_work(void)
  36 +void mmc_flush_scheduled_work(void)
  37  {
  38         flush_workqueue(workqueue);
  39  }
  40 +EXPORT_SYMBOL(mmc_flush_scheduled_work);
  41
  42  /**
  43   *     mmc_request_done - finish processing an MMC request
  44 Index: linux-3.1-rc4/include/linux/mmc/host.h
  45 ===================================================================
  46 --- linux-3.1-rc4.orig/include/linux/mmc/host.h 2011-08-29 06:16:01.000000000 +0200
  47 +++ linux-3.1-rc4/include/linux/mmc/host.h      2011-10-27 16:49:05.240930665 +0200
  48 @@ -394,4 +394,7 @@ static inline int mmc_host_cmd23(struct
  49  {
  50         return host->caps & MMC_CAP_CMD23;
  51  }
  52 +
  53 +void mmc_flush_scheduled_work(void);
  54 +
  55  #endif /* LINUX_MMC_HOST_H */