forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/drivers/video/fbdev/hpfb.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * HP300 Topcat framebuffer support (derived from macfb of all things)
34 * Phil Blundell <philb@gnu.org> 1998
....@@ -183,7 +184,7 @@
183184 return 0;
184185 }
185186
186
-static struct fb_ops hpfb_ops = {
187
+static const struct fb_ops hpfb_ops = {
187188 .owner = THIS_MODULE,
188189 .fb_setcolreg = hpfb_setcolreg,
189190 .fb_blank = hpfb_blank,
....@@ -401,7 +402,7 @@
401402 if (err)
402403 return err;
403404
404
- err = probe_kernel_read(&i, (unsigned char *)INTFBVADDR + DIO_IDOFF, 1);
405
+ err = copy_from_kernel_nofault(&i, (unsigned char *)INTFBVADDR + DIO_IDOFF, 1);
405406
406407 if (!err && (i == DIO_ID_FBUFFER) && topcat_sid_ok(sid = DIO_SECID(INTFBVADDR))) {
407408 if (!request_mem_region(INTFBPADDR, DIO_DEVSIZE, "Internal Topcat"))