openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: visorbus: my_device_destroy add error handling 

Add the proper error handling to my_device_destroy so it can be send
back up the stack for further error reporting.

Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: David Binder <david.binder@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2016-12-22 11:09:07 -05:00 committed by Greg Kroah-Hartman
parent 40fc79f9b4
commit e795491822
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1044,7 +1044,7 @@ my_device_changestate(struct controlvm_message *inmsg)
return err;
}
static void
static int
my_device_destroy(struct controlvm_message *inmsg)
{
struct controlvm_message_packet *cmd = &inmsg->cmd;
@ -1052,27 +1052,27 @@ my_device_destroy(struct controlvm_message *inmsg)
u32 bus_no = cmd->destroy_device.bus_no;
u32 dev_no = cmd->destroy_device.dev_no;
struct visor_device *dev_info;
int rc = CONTROLVM_RESP_SUCCESS;
int err;
dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
if (!dev_info) {
rc = -CONTROLVM_RESP_DEVICE_INVALID;
err = -ENODEV;
goto err_respond;
}
if (dev_info->state.created == 0) {
rc = -CONTROLVM_RESP_ALREADY_DONE;
err = -EINVAL;
goto err_respond;
}
if (dev_info->pending_msg_hdr) {
/* only non-NULL if dev is still waiting on a response */
rc = -CONTROLVM_RESP_ID_INVALID_FOR_CLIENT;
err = -EIO;
goto err_respond;
}
if (inmsg->hdr.flags.response_expected == 1) {
pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
if (!pmsg_hdr) {
rc = -CONTROLVM_RESP_KMALLOC_FAILED;
err = -ENOMEM;
goto err_respond;
}
@ -1082,11 +1082,12 @@ my_device_destroy(struct controlvm_message *inmsg)
}
chipset_device_destroy(dev_info);
return;
return 0;
err_respond:
if (inmsg->hdr.flags.response_expected == 1)
device_responder(inmsg->hdr.id, &inmsg->hdr, rc);
device_responder(inmsg->hdr.id, &inmsg->hdr, err);
return err;
}
/**