Merge tag 'staging-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fix from Greg KH:
"Here is a single staging driver fix, for the vc04 driver. It resolves
a reported problem that showed up in the merge window set of changes.

It's been in linux-next for over a week with no reported problems"

* tag 'staging-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: vchiq_debugfs: Fix NPD in vchiq_dump_state

Changed files
+6 -6
drivers
staging
vc04_services
+1 -1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
··· 1759 1759 if (err) 1760 1760 goto failed_platform_init; 1761 1761 1762 - vchiq_debugfs_init(); 1762 + vchiq_debugfs_init(&mgmt->state); 1763 1763 1764 1764 dev_dbg(&pdev->dev, "arm: platform initialised - version %d (min %d)\n", 1765 1765 VCHIQ_VERSION, VCHIQ_VERSION_MIN);
+4 -4
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
··· 42 42 43 43 static int vchiq_dump_show(struct seq_file *f, void *offset) 44 44 { 45 - struct vchiq_instance *instance = f->private; 45 + struct vchiq_state *state = f->private; 46 46 47 - vchiq_dump_state(f, instance->state); 47 + vchiq_dump_state(f, state); 48 48 49 49 return 0; 50 50 } ··· 121 121 debugfs_remove_recursive(node->dentry); 122 122 } 123 123 124 - void vchiq_debugfs_init(void) 124 + void vchiq_debugfs_init(struct vchiq_state *state) 125 125 { 126 126 vchiq_dbg_dir = debugfs_create_dir("vchiq", NULL); 127 127 vchiq_dbg_clients = debugfs_create_dir("clients", vchiq_dbg_dir); 128 128 129 - debugfs_create_file("state", S_IFREG | 0444, vchiq_dbg_dir, NULL, 129 + debugfs_create_file("state", S_IFREG | 0444, vchiq_dbg_dir, state, 130 130 &vchiq_dump_fops); 131 131 } 132 132
+1 -1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
··· 10 10 struct dentry *dentry; 11 11 }; 12 12 13 - void vchiq_debugfs_init(void); 13 + void vchiq_debugfs_init(struct vchiq_state *state); 14 14 15 15 void vchiq_debugfs_deinit(void); 16 16