Merge tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

torvalds · torvalds · commit 84b3e42564ac · 2021-10-04T09:53:40.000-07:00
Pull media fix from Mauro Carvalho Chehab:
 "There's just one patch here, fixing a -Werror issue at
  staging/atomisp"

* tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: atomisp: restore missing 'return' statement
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
@@ -1646,6 +1646,8 @@ static input_system_err_t input_system_configure_channel_sensor(
 	default:
 		return INPUT_SYSTEM_ERR_PARAMETER_NOT_SUPPORTED;
 	}
+
+	return INPUT_SYSTEM_ERR_NO_ERROR;
 }
 
 // Test flags and set structure.

Original file line number	Diff line number	Diff line change
`@@ -1646,6 +1646,8 @@ static input_system_err_t input_system_configure_channel_sensor(`
`1646`	`1646`	`default:`
`1647`	`1647`	`return INPUT_SYSTEM_ERR_PARAMETER_NOT_SUPPORTED;`
`1648`	`1648`	`}`
	`1649`	`+`
	`1650`	`+ return INPUT_SYSTEM_ERR_NO_ERROR;`
`1649`	`1651`	`}`
`1650`	`1652`
`1651`	`1653`	`// Test flags and set structure.`