Merge branch 'at91-4.14-trunk/ov7740' into linux-4.14-at91

cristibirsan · cristibirsan · commit 504e35dd20b9 · 2018-09-24T17:00:51.000+03:00
diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c
@@ -1136,7 +1136,9 @@ static int ov7740_probe(struct i2c_client *client,
 	ov7740_free_controls(ov7740);
 error_detect:
 	ov7740_set_power(ov7740, 0);
+#if defined(CONFIG_MEDIA_CONTROLLER)
 	media_entity_cleanup(&ov7740->subdev.entity);
+#endif
 
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,9 @@ static int ov7740_probe(struct i2c_client *client,`
`1136`	`1136`	`ov7740_free_controls(ov7740);`
`1137`	`1137`	`error_detect:`
`1138`	`1138`	`ov7740_set_power(ov7740, 0);`
	`1139`	`+#if defined(CONFIG_MEDIA_CONTROLLER)`
`1139`	`1140`	`media_entity_cleanup(&ov7740->subdev.entity);`
	`1141`	`+#endif`
`1140`	`1142`
`1141`	`1143`	`return ret;`
`1142`	`1144`	`}`