Merge tag 'f2fs-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[~andy/linux] / drivers / memstick / host / rtsx_pci_ms.c

diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c
index f5ddb82dadb71cb6d726f48f15782bedfa21016c..64a779c58a74fd9346444c62663817010f5331d3 100644 (file)
--- a/drivers/memstick/host/rtsx_pci_ms.c
+++ b/drivers/memstick/host/rtsx_pci_ms.c
@@ -426,6 +426,9 @@ static void rtsx_pci_ms_request(struct memstick_host *msh)
 
        dev_dbg(ms_dev(host), "--> %s\n", __func__);
 
+       if (rtsx_pci_card_exclusive_check(host->pcr, RTSX_MS_CARD))
+               return;
+
        schedule_work(&host->handle_req);
 }
 
@@ -441,6 +444,10 @@ static int rtsx_pci_ms_set_param(struct memstick_host *msh,
        dev_dbg(ms_dev(host), "%s: param = %d, value = %d\n",
                        __func__, param, value);
 
+       err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_MS_CARD);
+       if (err)
+               return err;
+
        switch (param) {
        case MEMSTICK_POWER:
                if (value == MEMSTICK_POWER_ON)