Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9ab0971 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-mmc 

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Add (MMC) to entry in MAINTAINERS file
  [MMC] sdhci truncated pointer fix
parents ff914453 12223dab

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1895,7 +1895,7 @@ L: linux-kernel@vger.kernel.org 
W:	http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html

S:	Maintained



MULTIMEDIA CARD SUBSYSTEM

MULTIMEDIA CARD (MMC) SUBSYSTEM

P:	Russell King

M:	rmk+mmc@arm.linux.org.uk

S:	Maintained

drivers/mmc/sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) 
	tasklet_init(&host->finish_tasklet,

		sdhci_tasklet_finish, (unsigned long)host);



	setup_timer(&host->timer, sdhci_timeout_timer, (int)host);

	setup_timer(&host->timer, sdhci_timeout_timer, (long)host);



	ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ,

		host->slot_descr, host);