diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
index e836913..d8d9bea 100644
|
a
|
b
|
done: |
| 398 | 398 | host->mrq = NULL; |
| 399 | 399 | mmc_request_done(host->mmc, cmd->mrq); |
| 400 | 400 | spin_unlock_irqrestore(&host->complete_lock, iflags); |
| | 401 | |
| 401 | 402 | } |
| 402 | 403 | |
| 403 | 404 | static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc) |
| … |
… |
static int glamo_mci_prepare_pio(struct glamo_mci_host *host, |
| 579 | 580 | return 0; |
| 580 | 581 | } |
| 581 | 582 | |
| | 583 | extern int iblock_limit; |
| | 584 | unsigned long s3c2410_gettimeoffset(void); |
| | 585 | |
| 582 | 586 | static void glamo_mci_send_request(struct mmc_host *mmc) |
| 583 | 587 | { |
| 584 | 588 | struct glamo_mci_host *host = mmc_priv(mmc); |
| … |
… |
static void glamo_mci_send_request(struct mmc_host *mmc) |
| 590 | 594 | int n; |
| 591 | 595 | int timeout = 1000000; |
| 592 | 596 | int insanity_timeout = 1000000; |
| | 597 | unsigned long us; |
| 593 | 598 | |
| 594 | 599 | if (host->suspending) { |
| 595 | 600 | dev_err(&host->pdev->dev, "IGNORING glamo_mci_send_request while " |
| … |
… |
static void glamo_mci_send_request(struct mmc_host *mmc) |
| 644 | 649 | * we must spin until response is ready or timed out |
| 645 | 650 | * -- we don't get interrupts unless there is a bulk rx |
| 646 | 651 | */ |
| | 652 | |
| | 653 | us = s3c2410_gettimeoffset(); |
| | 654 | |
| 647 | 655 | do |
| 648 | 656 | status = readw(host->base + GLAMO_REG_MMC_RB_STAT1); |
| 649 | 657 | while (((((status >> 15) & 1) != (host->ccnt & 1)) || |
| … |
… |
static void glamo_mci_send_request(struct mmc_host *mmc) |
| 653 | 661 | GLAMO_STAT1_MMC_BWERR | |
| 654 | 662 | GLAMO_STAT1_MMC_BRERR)))) && (insanity_timeout--)); |
| 655 | 663 | |
| | 664 | us = s3c2410_gettimeoffset() - us; |
| | 665 | if (iblock_limit && us > iblock_limit && us < 10000000) |
| | 666 | printk(KERN_ERR "glamo_mci_send_request: %lu us - %d polls\n", |
| | 667 | us, 1000000 - insanity_timeout); |
| | 668 | |
| 656 | 669 | if (insanity_timeout < 0) |
| 657 | 670 | dev_info(&host->pdev->dev, "command timeout, continuing\n"); |
| 658 | 671 | |