projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch develop-3.10 into develop-3.10-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
scsi_lib.c
diff --git
a/drivers/scsi/scsi_lib.c
b/drivers/scsi/scsi_lib.c
index e5953c8018c55919743397965a2b189757121fdd..26b898182e8f1939056c6f7cc8715b03e79a674e 100644
(file)
--- a/
drivers/scsi/scsi_lib.c
+++ b/
drivers/scsi/scsi_lib.c
@@
-1676,7
+1676,7
@@
u64 scsi_calculate_bounce_limit(struct Scsi_Host *shost)
host_dev = scsi_get_device(shost);
if (host_dev && host_dev->dma_mask)
- bounce_limit =
*host_dev->dma_mask
;
+ bounce_limit =
(u64)dma_max_pfn(host_dev) << PAGE_SHIFT
;
return bounce_limit;
}