staging: unisys: visorbus: my_device_destroy add error handling (e7954918) · Commits · 戴 / test

drivers/staging/unisys/visorbus/visorchipset.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -1044,7 +1044,7 @@ err_respond:
		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;
		}

		/**