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

Commit e93c99aa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mhi_dev: Check return value"

parents 5261ca92 0c8d0d87

drivers/platform/msm/mhi_dev/mhi.c

+15 −6
Original line number Diff line number Diff line
@@ -996,9 +996,12 @@ send_start_completion_event: 
			pr_err("Error sending command completion event\n");



		mhi_update_state_info(ch_id, MHI_STATE_CONNECTED);

		if (ch_id == MHI_CLIENT_MBIM_OUT)

			kobject_uevent_env(&mhi_ctx->dev->kobj,

		if (ch_id == MHI_CLIENT_MBIM_OUT) {

			rc = kobject_uevent_env(&mhi_ctx->dev->kobj,

						KOBJ_CHANGE, connected);

			if (rc)

				pr_err("Error sending uevent %d\n", rc);

		}

		break;

	case MHI_DEV_RING_EL_STOP:

		if (ch_id >= HW_CHANNEL_BASE) {
@@ -1054,9 +1057,12 @@ send_start_completion_event: 


			mutex_unlock(&ch->ch_lock);

			mhi_update_state_info(ch_id, MHI_STATE_DISCONNECTED);

			if (ch_id == MHI_CLIENT_MBIM_OUT)

				kobject_uevent_env(&mhi_ctx->dev->kobj,

			if (ch_id == MHI_CLIENT_MBIM_OUT) {

				rc = kobject_uevent_env(&mhi_ctx->dev->kobj,

						KOBJ_CHANGE, disconnected);

				if (rc)

					pr_err("Error sending uevent %d\n", rc);

			}

		}

		break;

	case MHI_DEV_RING_EL_RESET:
@@ -1131,9 +1137,12 @@ send_start_completion_event: 
				pr_err("Error sending command completion event\n");

			mutex_unlock(&ch->ch_lock);

			mhi_update_state_info(ch_id, MHI_STATE_DISCONNECTED);

			if (ch_id == MHI_CLIENT_MBIM_OUT)

				kobject_uevent_env(&mhi_ctx->dev->kobj,

			if (ch_id == MHI_CLIENT_MBIM_OUT) {

				rc = kobject_uevent_env(&mhi_ctx->dev->kobj,

						KOBJ_CHANGE, disconnected);

				if (rc)

					pr_err("Error sending uevent %d\n", rc);

			}

		}

		break;

	default:

drivers/platform/msm/mhi_dev/mhi.h

+0 −1
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ enum mhi_client_channel { 
#define MHI_DEV_UEVENT_CTRL	0



struct mhi_dev_uevent_info {

	enum mhi_client_channel	channel;

	enum mhi_ctrl_info	ctrl_info;

};