qiurui
/
RHEL-kernel-ark
mirror of https://gitlab.com/cki-project/kernel-ark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio fixes for v6.14-rc5 

- fix a buggy get_direction() retval check
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmfEOjwACgkQEacuoBRx
 13KDsw/9FM04f4qgMjhNw8Uj5LFYxtWSLLJF+y4kliF0WLggRVJINlsiqNU6/AM+
 Q487IuN+cxg4cbuQZaaNnOaKYsS5WDR7zBD5QVcm3NXsyYkyYiPBTd3i9YyRKXaj
 KPavknNXGnAFvz4q5RIF7sjchUnyWEfs4tQCxunK85yI66LAbN/i9O+dkI+BZRZb
 tGCHWNAFxRYwgUL1W93dtpTO60OXD6NIX1YTUsZzJ7f6OHirU5CupcgLWPhUl99x
 i7/1lnBz9EAFisoAKOuRB3cfr6DU5QZzUYITf1Iak2tCIUCGffGZ21uMu4BH60c+
 EAVsRQUsmuPO9GDXfdb8yE/1X4Vah/8xjEjgZ233trgyRoNQ0q+Ze5IDpKsKfzZI
 p/aCvSpZwxpfg7XYic+ixMzcKN2aAPD/gRU7hmZ04zwqM1kujNT37Av7/RGIRMFq
 vkQ5Gi58dF3kPrXpvH58M99Mhc92H7Y5KpE4l/FQ3pTDa8RVDvgF9sd2hhT+3qjd
 Md1dUtwkCtQh5zTjzpbPqMqzzn9hrPhgzyr40hUDdN44YvMAdsv5Txiff81+zUJU
 3h2LAJ2QsnDFLM6I4MnSNjyEz61F+IqNuPAbRv70Q2sZLigMfkDwG0zvQ/0hgK7p
 cXBTDqFDey8ip7BJDAoPGB++Ugt0uH+aT7K3zzFQfhU4k+a+UPo=
 =R+yf
 -----END PGP SIGNATURE-----

Merge tag 'gpio-fixes-for-v6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux

Pull gpio fix from Bartosz Golaszewski:

 - fix a buggy get_direction() retval check

* tag 'gpio-fixes-for-v6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpiolib: Fix Oops in gpiod_direction_input_nonotify()
This commit is contained in:
Linus Torvalds 2025-03-02 04:35:39 -08:00
parent ebb7d37abf 64407f4b58
commit 1973160c90
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpio/gpiolib.c
View File

@ -2712,7 +2712,7 @@ EXPORT_SYMBOL_GPL(gpiod_direction_input);
int gpiod_direction_input_nonotify(struct gpio_desc *desc)
{
int ret = 0;
int ret = 0, dir;
CLASS(gpio_chip_guard, guard)(desc);
if (!guard.gc)
@ -2740,12 +2740,12 @@ int gpiod_direction_input_nonotify(struct gpio_desc *desc)
ret = guard.gc->direction_input(guard.gc,
gpio_chip_hwgpio(desc));
} else if (guard.gc->get_direction) {
ret = guard.gc->get_direction(guard.gc,
dir = guard.gc->get_direction(guard.gc,
gpio_chip_hwgpio(desc));
if (ret < 0)
return ret;
if (dir < 0)
return dir;
if (ret != GPIO_LINE_DIRECTION_IN) {
if (dir != GPIO_LINE_DIRECTION_IN) {
gpiod_warn(desc,
"%s: missing direction_input() operation and line is output\n",
__func__);
@ -2764,7 +2764,7 @@ int gpiod_direction_input_nonotify(struct gpio_desc *desc)
static int gpiod_direction_output_raw_commit(struct gpio_desc *desc, int value)
{
int val = !!value, ret = 0;
int val = !!value, ret = 0, dir;
CLASS(gpio_chip_guard, guard)(desc);
if (!guard.gc)
@ -2788,12 +2788,12 @@ static int gpiod_direction_output_raw_commit(struct gpio_desc *desc, int value)
} else {
/* Check that we are in output mode if we can */
if (guard.gc->get_direction) {
ret = guard.gc->get_direction(guard.gc,
dir = guard.gc->get_direction(guard.gc,
gpio_chip_hwgpio(desc));
if (ret < 0)
return ret;
if (dir < 0)
return dir;
if (ret != GPIO_LINE_DIRECTION_OUT) {
if (dir != GPIO_LINE_DIRECTION_OUT) {
gpiod_warn(desc,
"%s: missing direction_output() operation\n",
__func__);