Commit e43c2feb authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

Merge tag 'intel-gpio-v6.9-1' of... 

Merge tag 'intel-gpio-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current

intel-gpio for v6.9-1

* Fix returned code in the error path in Intel PMIC GPIO drivers

The following is an automated git shortlog grouped by driver:

crystalcove:
 -  Use -ENOTSUPP consistently

wcove:
 -  Use -ENOTSUPP consistently
parents fec50db7 ace0ebe5

drivers/gpio/gpio-crystalcove.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static inline int to_reg(int gpio, enum ctrl_register reg_type) 
		case 0x5e:

			return GPIOPANELCTL;

		default:

			return -EOPNOTSUPP;

			return -ENOTSUPP;

		}

	}

drivers/gpio/gpio-wcove.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static inline int to_reg(int gpio, enum ctrl_register type) 
	unsigned int reg = type == CTRL_IN ? GPIO_IN_CTRL_BASE : GPIO_OUT_CTRL_BASE;



	if (gpio >= WCOVE_GPIO_NUM)

		return -EOPNOTSUPP;

		return -ENOTSUPP;



	return reg + gpio;

}