UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2016-11-03 11:44:20 -04:00 committed by Greg Kroah-Hartman
parent 8f334e30c3
commit 3e0e8db92f
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -902,18 +902,47 @@ static void
bus_destroy(struct controlvm_message *inmsg) bus_destroy(struct controlvm_message *inmsg)
{ {
struct controlvm_message_packet *cmd = &inmsg->cmd; struct controlvm_message_packet *cmd = &inmsg->cmd;
struct controlvm_message_header *pmsg_hdr = NULL;
u32 bus_no = cmd->destroy_bus.bus_no; u32 bus_no = cmd->destroy_bus.bus_no;
struct visor_device *bus_info; struct visor_device *bus_info;
int rc = CONTROLVM_RESP_SUCCESS; int rc = CONTROLVM_RESP_SUCCESS;
bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL); 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; 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; 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, memcpy(pmsg_hdr, &inmsg->hdr,
rc, inmsg->hdr.flags.response_expected == 1); 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 */ /* bus_info is freed as part of the busdevice_release function */
} }