Commit d3e6dc4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e12fa4dd c3552ab1

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ static int vchiq_probe(struct platform_device *pdev) 
	if (err)

		goto failed_platform_init;



	vchiq_debugfs_init();

	vchiq_debugfs_init(&mgmt->state);



	dev_dbg(&pdev->dev, "arm: platform initialised - version %d (min %d)\n",

		VCHIQ_VERSION, VCHIQ_VERSION_MIN);

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c

+4 −4
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ static int debugfs_trace_show(struct seq_file *f, void *offset) 


static int vchiq_dump_show(struct seq_file *f, void *offset)

{

	struct vchiq_instance *instance = f->private;

	struct vchiq_state *state = f->private;



	vchiq_dump_state(f, instance->state);

	vchiq_dump_state(f, state);



	return 0;

}
@@ -121,12 +121,12 @@ void vchiq_debugfs_remove_instance(struct vchiq_instance *instance) 
	debugfs_remove_recursive(node->dentry);

}



void vchiq_debugfs_init(void)

void vchiq_debugfs_init(struct vchiq_state *state)

{

	vchiq_dbg_dir = debugfs_create_dir("vchiq", NULL);

	vchiq_dbg_clients = debugfs_create_dir("clients", vchiq_dbg_dir);



	debugfs_create_file("state", S_IFREG | 0444, vchiq_dbg_dir, NULL,

	debugfs_create_file("state", S_IFREG | 0444, vchiq_dbg_dir, state,

			    &vchiq_dump_fops);

}

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ struct vchiq_debugfs_node { 
	struct dentry *dentry;

};



void vchiq_debugfs_init(void);

void vchiq_debugfs_init(struct vchiq_state *state);



void vchiq_debugfs_deinit(void);