Commit 40fc79f9 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman

staging: unisys: visorbus: my_device_changestate add error handling

The function my_device_changestate was not returning errors up the stack.
Reported-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarDavid Binder <david.binder@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 300ed612
...@@ -983,7 +983,7 @@ my_device_create(struct controlvm_message *inmsg) ...@@ -983,7 +983,7 @@ my_device_create(struct controlvm_message *inmsg)
return err; return err;
} }
static void static int
my_device_changestate(struct controlvm_message *inmsg) my_device_changestate(struct controlvm_message *inmsg)
{ {
struct controlvm_message_packet *cmd = &inmsg->cmd; struct controlvm_message_packet *cmd = &inmsg->cmd;
...@@ -992,30 +992,30 @@ my_device_changestate(struct controlvm_message *inmsg) ...@@ -992,30 +992,30 @@ my_device_changestate(struct controlvm_message *inmsg)
u32 dev_no = cmd->device_change_state.dev_no; u32 dev_no = cmd->device_change_state.dev_no;
struct spar_segment_state state = cmd->device_change_state.state; struct spar_segment_state state = cmd->device_change_state.state;
struct visor_device *dev_info; struct visor_device *dev_info;
int rc = CONTROLVM_RESP_SUCCESS; int err;
dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL); dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
if (!dev_info) { if (!dev_info) {
POSTCODE_LINUX(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no, POSTCODE_LINUX(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
DIAG_SEVERITY_ERR); DIAG_SEVERITY_ERR);
rc = -CONTROLVM_RESP_DEVICE_INVALID; err = -ENODEV;
goto err_respond; goto err_respond;
} }
if (dev_info->state.created == 0) { if (dev_info->state.created == 0) {
POSTCODE_LINUX(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no, POSTCODE_LINUX(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
DIAG_SEVERITY_ERR); DIAG_SEVERITY_ERR);
rc = -CONTROLVM_RESP_DEVICE_INVALID; err = -EINVAL;
goto err_respond; goto err_respond;
} }
if (dev_info->pending_msg_hdr) { if (dev_info->pending_msg_hdr) {
/* only non-NULL if dev is still waiting on a response */ /* only non-NULL if dev is still waiting on a response */
rc = -CONTROLVM_RESP_ID_INVALID_FOR_CLIENT; err = -EIO;
goto err_respond; goto err_respond;
} }
if (inmsg->hdr.flags.response_expected == 1) { if (inmsg->hdr.flags.response_expected == 1) {
pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL); pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
if (!pmsg_hdr) { if (!pmsg_hdr) {
rc = -CONTROLVM_RESP_KMALLOC_FAILED; err = -ENOMEM;
goto err_respond; goto err_respond;
} }
...@@ -1036,12 +1036,12 @@ my_device_changestate(struct controlvm_message *inmsg) ...@@ -1036,12 +1036,12 @@ my_device_changestate(struct controlvm_message *inmsg)
* Response will be sent from chipset_device_pause. * Response will be sent from chipset_device_pause.
*/ */
chipset_device_pause(dev_info); chipset_device_pause(dev_info);
return 0;
return;
err_respond: err_respond:
if (inmsg->hdr.flags.response_expected == 1) 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;
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment