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

Commit 3e0e8db9 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: bus_destroy do not call bus_epilog 



Have bus_destroy call chipset_bus_destroy directly instead of going
through bus_epilog.

Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <Timothy.Sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f334e30

drivers/staging/unisys/visorbus/visorchipset.c

+33 −4
Original line number Diff line number Diff line
@@ -902,18 +902,47 @@ static void 
bus_destroy(struct controlvm_message *inmsg)

{

	struct controlvm_message_packet *cmd = &inmsg->cmd;

	struct controlvm_message_header *pmsg_hdr = NULL;

	u32 bus_no = cmd->destroy_bus.bus_no;

	struct visor_device *bus_info;

	int rc = CONTROLVM_RESP_SUCCESS;



	bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);

	if (!bus_info)

	if (!bus_info) {

		rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;

	else if (bus_info->state.created == 0)

		goto out_respond;

	}

	if (bus_info->state.created == 0) {

		rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;

		goto out_respond;

	}

	if (bus_info->pending_msg_hdr) {

		/* only non-NULL if dev is still waiting on a response */

		rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;

		goto out_respond;

	}

	if (inmsg->hdr.flags.response_expected == 1) {

		pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);

		if (!pmsg_hdr) {

			POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd,

					 bus_info->chipset_bus_no,

					 POSTCODE_SEVERITY_ERR);

			rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;

			goto out_respond;

		}



	bus_epilog(bus_info, CONTROLVM_BUS_DESTROY, &inmsg->hdr,

		   rc, inmsg->hdr.flags.response_expected == 1);

		memcpy(pmsg_hdr, &inmsg->hdr,

		       sizeof(struct controlvm_message_header));

		bus_info->pending_msg_hdr = pmsg_hdr;

	}



	/* Response will be handled by chipset_bus_destroy */

	chipset_bus_destroy(bus_info);

	return;



out_respond:

	if (inmsg->hdr.flags.response_expected == 1)

		bus_responder(inmsg->hdr.id, &inmsg->hdr, rc);



	/* bus_info is freed as part of the busdevice_release function */

}