diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-04 09:53:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-04 09:53:40 -0700 |
| commit | 84b3e42564accd94c2680e3ba42717c32c8b5fc4 (patch) | |
| tree | 9bde4509e8164a70b46706f9a51fe38564424362 | |
| parent | b60be028fc1a07a88a391aa4ff3304d9dcb3d66e (diff) | |
| parent | 206704a1fe0bcaaa036d3e90358bb168fac8bea1 (diff) | |
| download | linux-84b3e42564accd94c2680e3ba42717c32c8b5fc4.tar.gz linux-84b3e42564accd94c2680e3ba42717c32c8b5fc4.tar.bz2 linux-84b3e42564accd94c2680e3ba42717c32c8b5fc4.zip | |
Merge tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
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
| -rw-r--r-- | drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c | 2 |
1 files changed, 2 insertions, 0 deletions
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..712e01c37870 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,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. |