-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAmFbI90ACgkQCF8+vY7k
 4RUFHg/+IWfm0tPd6+ridrwLc2ssvMnLOhOxkdIAlTAzhgPVcATIvThiz719Ke7n
 aAKkoDofBIYkGF15WNPTBOf+zVvcsLT1hzAfH1/P5KyETGlqNaemLTerbdqAxGNa
 k07ZsihenDKHpScmymEdDCXaoU3GPZE830GWYtIoAsOgL0q5VatlyvBGjSgiN1eW
 itJI9PlE4wTWtKImGXixAVcUs13G4oLepjLCFJ+qxOhX7GVJYE6Vws9pNxq/Mwen
 uGZ61gtFuAq0vJkz0rTJRBDfTtpWiIKje7xS6QgNcUug1yw19F2gRMCHGrNPb8+h
 93MVMy5NnoC5Im2vktpYfeRMIzo4cTsl1DXBqlXNABwsGyna9vKuc7NXPM/phY2T
 kyNYeaSRuRDlMk0Xxcr2REhbosIjArjg+cvv01Zfn5qsIODS1aGHT9jr4TD7SdQM
 H3jKuY/Whs8aP6su68J8W6i3vPeWvY3KQ5y4snc1dqVH9zsiQGWLGm0F3h42/ZHv
 EqDXKi/VrQ1Ub6Biaw3d+U3dJVSakHpajHN9QVzG/ObnJ+dLqCx1PRS7ewm5Ls4C
 gbtQkmn0DRMHrmiuCw7jhi79zxELTetjsfjx9WU9FvF9epliit1pZlHls0xffFyQ
 lpuo+Y+bJy+ntjDBPLig9UkfhvlqCzZNU9K2XRJYkxWl5uWQ+uM=
 =GuK+
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-10-04 09:53:40 -07:00
Родитель b60be028fc 206704a1fe
Коммит 84b3e42564
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -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.