From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 2 Jul 2006 21:58:03 +0000 (-0700)
Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.18-rc1~146
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=168d04b3b4de7723eb73b3cffc9cb75224e0f393;p=linux-2.6

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] sdhci: version bump sdhci
  [MMC] sdhci: support controller specific quirks
  [MMC] sdhci: more DMA capabilities tests
  [MMC] sdhci: reset sdhci controller early
  [MMC] sdhci: check controller version
  [MMC] sdhci: check only relevant inhibit bits
  [MMC] sdhci: Test for invalid block size
  [MMC] sdhci: Avoid sdhci DMA boundaries
  [MMC] Fix sdhci PIO routines
  [MMC] sdhci: fix interrupt handling
  [MMC] sdhci: correct register order
  [MMC] sdhci: proper timeout handling
  [MMC] sdhci: fix sdhci reset timeout
  [MMC] sdhci: fix timeout loops in sdhci
  [MMC] sdhci: support for multiple voltages
  [MMC] sdhci: print device id
  [MMC] sdhci: check SDHCI base clock
---

168d04b3b4de7723eb73b3cffc9cb75224e0f393
diff --cc drivers/mmc/sdhci.c
index a871c09a6e,e192f3c9a4..74134699cc
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@@ -1075,10 -1271,10 +1271,10 @@@ static int __devinit sdhci_probe_slot(s
  
  	setup_timer(&host->timer, sdhci_timeout_timer, (long)host);
  
 -	ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ,
 +	ret = request_irq(host->irq, sdhci_irq, IRQF_SHARED,
  		host->slot_descr, host);
  	if (ret)
- 		goto unmap;
+ 		goto untasklet;
  
  	sdhci_init(host);