summaryrefslogtreecommitdiff
path: root/drivers/of/device.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-09 10:37:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-09 10:37:10 +0100
commit9b085d6e889076928d307f05cabf76e35db1e63b (patch)
tree89c83eec98ed9bf07d07d8a7b0dea51564ecd61a /drivers/of/device.c
parent441494ec2a302830357d0aa59f3b907e319a8b26 (diff)
parentf8394f232b1eab649ce2df5c5f15b0e528c92091 (diff)
downloadlinux-next-9b085d6e889076928d307f05cabf76e35db1e63b.tar.gz
linux-next-9b085d6e889076928d307f05cabf76e35db1e63b.zip
Merge 5.10-rc3 into tty-next
We need the TTY/vt/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of/device.c')
-rw-r--r--drivers/of/device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 3a469c79e6b0..aedfaaafd3e7 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -112,7 +112,7 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,
u64 dma_end = 0;
/* Determine the overall bounds of all DMA regions */
- for (dma_start = ~0ULL; r->size; r++) {
+ for (dma_start = ~0; r->size; r++) {
/* Take lower and upper limits */
if (r->dma_start < dma_start)
dma_start = r->dma_start;