mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
27 lines
976 B
Diff
27 lines
976 B
Diff
From 55278992137e6a29dc913319ddd5d259e1f37b06 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Tue, 27 Oct 2020 12:12:22 +0000
|
|
Subject: [PATCH 324/634] bcm2708_fb: Fix a build warning
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/video/fbdev/bcm2708_fb.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
|
|
index dac5c021ce52..365c5b96b8a0 100644
|
|
--- a/drivers/video/fbdev/bcm2708_fb.c
|
|
+++ b/drivers/video/fbdev/bcm2708_fb.c
|
|
@@ -693,7 +693,8 @@ static long vc_mem_copy(struct bcm2708_fb *fb, struct fb_dmacopy *ioparam)
|
|
u8 *q = (u8 *)ioparam->dst + offset;
|
|
|
|
dma_memcpy(fb, bus_addr,
|
|
- INTALIAS_L1L2_NONALLOCATING((dma_addr_t)p), size);
|
|
+ INTALIAS_L1L2_NONALLOCATING((u32)(uintptr_t)p),
|
|
+ size);
|
|
if (copy_to_user(q, buf, s) != 0) {
|
|
pr_err("[%s]: failed to copy-to-user\n", __func__);
|
|
rc = -EFAULT;
|
|
--
|
|
2.33.1
|
|
|