diff mbox series

media: atomisp: fix control reaches end of non-void function error

Message ID 20210910223700.32494-1-skhan@linuxfoundation.org
State New
Headers show
Series media: atomisp: fix control reaches end of non-void function error | expand

Commit Message

Shuah Khan Sept. 10, 2021, 10:37 p.m. UTC
Fix the following build error with -Werror=return-type enabled. Fix
input_system_configure_channel_sensor() to return status when control
reaches the end.

drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.o
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c: In function ‘input_system_configure_channel_sensor’:
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:1649:1: error: control reaches end of non-void function [-Werror=return-type]
 1649 | }

Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
---
 .../media/atomisp/pci/hive_isp_css_common/host/input_system.c    | 1 +
 1 file changed, 1 insertion(+)

Comments

Dan Carpenter Sept. 13, 2021, 8:41 a.m. UTC | #1
On Fri, Sep 10, 2021 at 04:37:00PM -0600, Shuah Khan wrote:
> Fix the following build error with -Werror=return-type enabled. Fix

> input_system_configure_channel_sensor() to return status when control

> reaches the end.

> 

> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.o

> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c: In function ‘input_system_configure_channel_sensor’:

> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:1649:1: error: control reaches end of non-void function [-Werror=return-type]

>  1649 | }

> 

> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>


Hi Shuah,

You're the third person to send this patch recently but it was fixed on
Aug 2 in staging-next in commit 05344a1d2ea7 ("media: atomisp: restore
missing 'return' statement").  What tree are you working against?  It
seems like it needs to be backported somewhere.

regards,
dan carpenter
Shuah Khan Sept. 13, 2021, 2:24 p.m. UTC | #2
On 9/13/21 2:41 AM, Dan Carpenter wrote:
> On Fri, Sep 10, 2021 at 04:37:00PM -0600, Shuah Khan wrote:

>> Fix the following build error with -Werror=return-type enabled. Fix

>> input_system_configure_channel_sensor() to return status when control

>> reaches the end.

>>

>> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.o

>> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c: In function ‘input_system_configure_channel_sensor’:

>> drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:1649:1: error: control reaches end of non-void function [-Werror=return-type]

>>   1649 | }

>>

>> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

> 

> Hi Shuah,

> 

> You're the third person to send this patch recently but it was fixed on

> Aug 2 in staging-next in commit 05344a1d2ea7 ("media: atomisp: restore

> missing 'return' statement").  What tree are you working against?  It

> seems like it needs to be backported somewhere.

> 


I am working on Linux 5.15 - should have checked staging next though before
sending the patch :)

thanks,
-- Shuah
diff mbox series

Patch

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
index 8e085dda0c18..5d088d6fb01f 100644
--- 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,7 @@  static input_system_err_t input_system_configure_channel_sensor(
 	default:
 		return INPUT_SYSTEM_ERR_PARAMETER_NOT_SUPPORTED;
 	}
+	return status;
 }
 
 // Test flags and set structure.