commit 2810b66658873b8ef9ffb4dcf28ce6ba24d1a592
author Kieran Bingham <kieran+renesas@bingham.xyz> Tue Sep 13 11:06:01 2016 +0100
committer Kieran Bingham <kieran+renesas@bingham.xyz> Tue Sep 13 11:06:01 2016 +0100
tree d7b3a30d66839a14bb2b7e03679451093a14a70f
parent 9f459918950b9ef92b94d6e0f947168876442b41

fixup! v4l: vsp1: Support multiple partitions per frame

drivers/media/platform/vsp1/vsp1_uds.c

diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platform/vsp1/vsp1_uds.c
index be11fad..a8fbe98 100644
--- a/drivers/media/platform/vsp1/vsp1_uds.c
+++ b/drivers/media/platform/vsp1/vsp1_uds.c
@@ -271,11 +271,6 @@
 	unsigned int vscale;
 	bool multitap;
 
-	input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
-					   UDS_PAD_SINK);
-	output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
-					    UDS_PAD_SOURCE);
-
 	if (params == VSP1_ENTITY_PARAMS_PARTITION) {
 		const struct v4l2_rect *clip = &pipe->partition;
 
@@ -287,6 +282,11 @@
 	if (params != VSP1_ENTITY_PARAMS_INIT)
 		return;
 
+	input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+					   UDS_PAD_SINK);
+	output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+					    UDS_PAD_SOURCE);
+
 	hscale = uds_compute_ratio(input->width, output->width);
 	vscale = uds_compute_ratio(input->height, output->height);