forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87
kernel/drivers/dio/dio.c
....@@ -89,8 +89,8 @@
8989 #undef DIONAME
9090 #undef DIOFBNAME
9191
92
-static const char *unknowndioname
93
- = "unknown DIO board -- please email <linux-m68k@lists.linux-m68k.org>!";
92
+static const char unknowndioname[]
93
+ = "unknown DIO board, please email linux-m68k@lists.linux-m68k.org";
9494
9595 static const char *dio_getname(int id)
9696 {
....@@ -135,7 +135,8 @@
135135 else
136136 va = ioremap(pa, PAGE_SIZE);
137137
138
- if (probe_kernel_read(&i, (unsigned char *)va + DIO_IDOFF, 1)) {
138
+ if (copy_from_kernel_nofault(&i,
139
+ (unsigned char *)va + DIO_IDOFF, 1)) {
139140 if (scode >= DIOII_SCBASE)
140141 iounmap(va);
141142 continue; /* no board present at that select code */
....@@ -208,7 +209,8 @@
208209 else
209210 va = ioremap(pa, PAGE_SIZE);
210211
211
- if (probe_kernel_read(&i, (unsigned char *)va + DIO_IDOFF, 1)) {
212
+ if (copy_from_kernel_nofault(&i,
213
+ (unsigned char *)va + DIO_IDOFF, 1)) {
212214 if (scode >= DIOII_SCBASE)
213215 iounmap(va);
214216 continue; /* no board present at that select code */