Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'staging-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are two small staging driver fixes for 6.10-rc6, both for the
vc04_services drivers:
- build fix if CONFIG_DEBUGFS was not set
- initialization check fix that was much reported.
Both of these have been in linux-next this week with no reported
issues"
* tag 'staging-6.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: vchiq_debugfs: Fix build if CONFIG_DEBUG_FS is not set
staging: vc04_services: vchiq_arm: Fix initialisation check
+14
-4
+2
-2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+2
-2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
···
707
707
* block forever.
708
708
*/
709
709
for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
710
-
if (state)
710
+
if (vchiq_remote_initialised(state))
711
711
break;
712
712
usleep_range(500, 600);
713
713
}
···
1202
1202
{
1203
1203
int i;
1204
1204
1205
-
if (!state)
1205
+
if (!vchiq_remote_initialised(state))
1206
1206
return;
1207
1207
1208
1208
/*
+5
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+5
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
···
413
413
struct opaque_platform_state *platform_state;
414
414
};
415
415
416
+
static inline bool vchiq_remote_initialised(const struct vchiq_state *state)
417
+
{
418
+
return state->remote && state->remote->initialised;
419
+
}
420
+
416
421
struct bulk_waiter {
417
422
struct vchiq_bulk *bulk;
418
423
struct completion event;
+1
-1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+1
-1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+6
-1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
+6
-1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
···
1170
1170
1171
1171
dev_dbg(state->dev, "arm: vchiq open\n");
1172
1172
1173
+
if (!vchiq_remote_initialised(state)) {
1174
+
dev_dbg(state->dev, "arm: vchiq has no connection to VideoCore\n");
1175
+
return -ENOTCONN;
1176
+
}
1177
+
1173
1178
instance = kzalloc(sizeof(*instance), GFP_KERNEL);
1174
1179
if (!instance)
1175
1180
return -ENOMEM;
···
1205
1200
1206
1201
dev_dbg(state->dev, "arm: instance=%p\n", instance);
1207
1202
1208
-
if (!state) {
1203
+
if (!vchiq_remote_initialised(state)) {
1209
1204
ret = -EPERM;
1210
1205
goto out;
1211
1206
}