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

Commit ada58ced authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab
Browse files

[media] smiapp: create pad links after subdev registration 



The smiapp driver creates the pads links before the media entity is
registered with the media device. This doesn't work now that object
IDs are used to create links so the media_device has to be set.

Move entity registration logic before pads links creation.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c5a98cac

drivers/media/i2c/smiapp/smiapp-core.c

+10 −10
Original line number Diff line number Diff line
@@ -2495,6 +2495,14 @@ static int smiapp_register_subdevs(struct smiapp_sensor *sensor) 
			return rval;

		}



		rval = v4l2_device_register_subdev(sensor->src->sd.v4l2_dev,

						   &this->sd);

		if (rval) {

			dev_err(&client->dev,

				"v4l2_device_register_subdev failed\n");

			return rval;

		}



		rval = media_create_pad_link(&this->sd.entity,

					     this->source_pad,

					     &last->sd.entity,
@@ -2506,14 +2514,6 @@ static int smiapp_register_subdevs(struct smiapp_sensor *sensor) 
				"media_create_pad_link failed\n");

			return rval;

		}



		rval = v4l2_device_register_subdev(sensor->src->sd.v4l2_dev,

						   &this->sd);

		if (rval) {

			dev_err(&client->dev,

				"v4l2_device_register_subdev failed\n");

			return rval;

		}

	}



	return 0;