diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-25 01:21:29 -0500 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-25 01:21:29 -0500 |
| commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
| tree | ee891d6236bcd8dc988624839760aaa1846cf906 /drivers/scsi | |
| parent | 00efcb1c8e1c3c5e5d3ce6f0682d66402911a84f (diff) | |
| parent | 60480994c70981d0336aadb3f46b052977d3d19f (diff) | |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 7bd7f0d5f050..62ec84b42e31 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -1684,7 +1684,7 @@ u64 scsi_calculate_bounce_limit(struct Scsi_Host *shost) | |||
| 1684 | 1684 | ||
| 1685 | host_dev = scsi_get_device(shost); | 1685 | host_dev = scsi_get_device(shost); |
| 1686 | if (host_dev && host_dev->dma_mask) | 1686 | if (host_dev && host_dev->dma_mask) |
| 1687 | bounce_limit = dma_max_pfn(host_dev) << PAGE_SHIFT; | 1687 | bounce_limit = (u64)dma_max_pfn(host_dev) << PAGE_SHIFT; |
| 1688 | 1688 | ||
| 1689 | return bounce_limit; | 1689 | return bounce_limit; |
| 1690 | } | 1690 | } |