diff options
Diffstat (limited to 'drivers/pinctrl/intel/pinctrl-lynxpoint.c')
| -rw-r--r-- | drivers/pinctrl/intel/pinctrl-lynxpoint.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c index 19e8f8f1f7aa..ddb201e5d78f 100644 --- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c +++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c @@ -118,12 +118,6 @@ static int lp_gpio_request(struct gpio_chip *chip, unsigned int offset) pm_runtime_get(lg->dev); /* should we put if failed */ - /* Fail if BIOS reserved pin for ACPI use */ - if (lp_gpio_acpi_use(lg, offset)) { - dev_err(lg->dev, "gpio %d reserved for ACPI\n", offset); - return -EBUSY; - } - /* * Reconfigure pin to GPIO mode if needed and issue a warning, * since we expect firmware to configure it properly. @@ -280,6 +274,12 @@ static int lp_irq_set_type(struct irq_data *d, unsigned int type) if (hwirq >= lg->chip.ngpio) return -EINVAL; + /* Fail if BIOS reserved pin for ACPI use */ + if (lp_gpio_acpi_use(lg, hwirq)) { + dev_err(lg->dev, "pin %u can't be used as IRQ\n", hwirq); + return -EBUSY; + } + raw_spin_lock_irqsave(&lg->lock, flags); value = ioread32(reg); |