Commit 5ffc1c4c authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

firmware: arm_scmi: Fix devres allocation device in virtio transport 



SCMI virtio transport device managed allocations must use the main
platform device in devres operations instead of the channel devices.

Cc: Peter Hilber <peter.hilber@opensynergy.com>
Fixes: 46abe13b ("firmware: arm_scmi: Add virtio transport")
Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Link: https://lore.kernel.org/r/20221028140833.280091-5-cristian.marussi@arm.com


Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent be9ba1f7

drivers/firmware/arm_scmi/virtio.c

+3 −3
Original line number Diff line number Diff line
@@ -444,12 +444,12 @@ static int virtio_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, 
	for (i = 0; i < vioch->max_msg; i++) {

		struct scmi_vio_msg *msg;



		msg = devm_kzalloc(cinfo->dev, sizeof(*msg), GFP_KERNEL);

		msg = devm_kzalloc(dev, sizeof(*msg), GFP_KERNEL);

		if (!msg)

			return -ENOMEM;



		if (tx) {

			msg->request = devm_kzalloc(cinfo->dev,

			msg->request = devm_kzalloc(dev,

						    VIRTIO_SCMI_MAX_PDU_SIZE,

						    GFP_KERNEL);

			if (!msg->request)
@@ -458,7 +458,7 @@ static int virtio_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, 
			refcount_set(&msg->users, 1);

		}



		msg->input = devm_kzalloc(cinfo->dev, VIRTIO_SCMI_MAX_PDU_SIZE,

		msg->input = devm_kzalloc(dev, VIRTIO_SCMI_MAX_PDU_SIZE,

					  GFP_KERNEL);

		if (!msg->input)

			return -ENOMEM;