Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc842407 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Greg Kroah-Hartman
Browse files

stm class: Plug stm device's unlink callback 



STM device's unlink callback is never actually called from anywhere in
the stm class code.

This patch adds calls to stm driver's unlink method after the unlinking
has succeeded.

Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b4ca34aa

drivers/hwtracing/stm/core.c

+19 −4
Original line number Diff line number Diff line
@@ -376,14 +376,19 @@ static int stm_char_open(struct inode *inode, struct file *file) 
static int stm_char_release(struct inode *inode, struct file *file)

{

	struct stm_file *stmf = file->private_data;

	struct stm_device *stm = stmf->stm;



	stm_output_free(stmf->stm, &stmf->output);

	if (stm->data->unlink)

		stm->data->unlink(stm->data, stmf->output.master,

				  stmf->output.channel);



	stm_output_free(stm, &stmf->output);



	/*

	 * matches the stm_char_open()'s

	 * class_find_device() + try_module_get()

	 */

	stm_put_device(stmf->stm);

	stm_put_device(stm);

	kfree(stmf);



	return 0;
@@ -865,9 +870,19 @@ static int __stm_source_link_drop(struct stm_source_device *src, 
	spin_unlock(&src->link_lock);

	spin_unlock(&stm->link_lock);



	if (!ret && src->data->unlink)

	/*

	 * Call the unlink callbacks for both source and stm, when we know

	 * that we have actually performed the unlinking.

	 */

	if (!ret) {

		if (src->data->unlink)

			src->data->unlink(src->data);



		if (stm->data->unlink)

			stm->data->unlink(stm->data, src->output.master,

					  src->output.channel);

	}



	return ret;

}

include/linux/stm.h

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ struct stm_device; 
 *      it must return zero;

 *   3) if it does not support the requested packet type/flag combination,

 *      it must return -ENOTSUPP.

 *

 * The @unlink callback is called when there are no more active writers so

 * that the master/channel can be quiesced.

 */

struct stm_data {

	const char		*name;