Merge branch 'fixes' into next

[linux-block.git] / drivers / mmc / host / bcm2835.c

diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index bb31e13648d6577d47c5b0bd268a7cf0ccc80d5a..148414d7f0c9d341157f1f4335428bbc297fe530 100644 (file)
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -1314,7 +1314,7 @@ static int bcm2835_add_host(struct bcm2835_host *host)
        }
 
        mmc->max_segs = 128;
-       mmc->max_req_size = 524288;
+       mmc->max_req_size = min_t(size_t, 524288, dma_max_mapping_size(dev));
        mmc->max_seg_size = mmc->max_req_size;
        mmc->max_blk_size = 1024;
        mmc->max_blk_count =  65535;
@@ -1409,7 +1409,6 @@ static int bcm2835_probe(struct platform_device *pdev)
 
        host->irq = platform_get_irq(pdev, 0);
        if (host->irq <= 0) {
-               dev_err(dev, "get IRQ failed\n");
                ret = -EINVAL;
                goto err;
        }