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

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

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  bug in AT91 MCI suspend routines
parents e4cb0407 e0cda54e

drivers/mmc/host/at91_mci.c

+3 −3
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev) 


	host = mmc_priv(mmc);



	if (host->present != -1) {

	if (host->board->det_pin) {

		device_init_wakeup(&pdev->dev, 0);

		free_irq(host->board->det_pin, host);

		cancel_delayed_work(&host->mmc->detect);
@@ -972,7 +972,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state) 
	struct at91mci_host *host = mmc_priv(mmc);

	int ret = 0;



	if (device_may_wakeup(&pdev->dev))

	if (host->board->det_pin && device_may_wakeup(&pdev->dev))

		enable_irq_wake(host->board->det_pin);



	if (mmc)
@@ -987,7 +987,7 @@ static int at91_mci_resume(struct platform_device *pdev) 
	struct at91mci_host *host = mmc_priv(mmc);

	int ret = 0;



	if (device_may_wakeup(&pdev->dev))

	if (host->board->det_pin && device_may_wakeup(&pdev->dev))

		disable_irq_wake(host->board->det_pin);



	if (mmc)