tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove
mmc: sdhci-s3c: fix incorrect spinlock usage after merge
mmc: MAINTAINERS: add myself as MMC maintainer

Linus Torvalds 65097561 9a457a52

+14 -6
+6 -2
MAINTAINERS
··· 3925 3925 F: drivers/mfd/ 3926 3926 3927 3927 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM 3928 - S: Orphan 3928 + M: Chris Ball <cjb@laptop.org> 3929 3929 L: linux-mmc@vger.kernel.org 3930 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 3931 + S: Maintained 3930 3932 F: drivers/mmc/ 3931 3933 F: include/linux/mmc/ 3932 3934 ··· 5099 5097 F: drivers/mmc/host/sdricoh_cs.c 5100 5098 5101 5099 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER 5102 - S: Orphan 5100 + M: Chris Ball <cjb@laptop.org> 5103 5101 L: linux-mmc@vger.kernel.org 5102 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 5103 + S: Maintained 5104 5104 F: drivers/mmc/host/sdhci.* 5105 5105 5106 5106 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
+8 -4
drivers/mmc/host/sdhci-s3c.c
··· 241 241 static void sdhci_s3c_notify_change(struct platform_device *dev, int state) 242 242 { 243 243 struct sdhci_host *host = platform_get_drvdata(dev); 244 + unsigned long flags; 245 + 244 246 if (host) { 245 - spin_lock(&host->lock); 247 + spin_lock_irqsave(&host->lock, flags); 246 248 if (state) { 247 249 dev_dbg(&dev->dev, "card inserted.\n"); 248 250 host->flags &= ~SDHCI_DEVICE_DEAD; ··· 255 253 host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION; 256 254 } 257 255 tasklet_schedule(&host->card_tasklet); 258 - spin_unlock(&host->lock); 256 + spin_unlock_irqrestore(&host->lock, flags); 259 257 } 260 258 } 261 259 ··· 483 481 sdhci_remove_host(host, 1); 484 482 485 483 for (ptr = 0; ptr < 3; ptr++) { 486 - clk_disable(sc->clk_bus[ptr]); 487 - clk_put(sc->clk_bus[ptr]); 484 + if (sc->clk_bus[ptr]) { 485 + clk_disable(sc->clk_bus[ptr]); 486 + clk_put(sc->clk_bus[ptr]); 487 + } 488 488 } 489 489 clk_disable(sc->clk_io); 490 490 clk_put(sc->clk_io);