|
@@ -1168,6 +1168,14 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
|
|
|
new->flags &= ~IRQF_ONESHOT;
|
|
|
|
|
|
mutex_lock(&desc->request_mutex);
|
|
|
+ if (!desc->action) {
|
|
|
+ ret = irq_request_resources(desc);
|
|
|
+ if (ret) {
|
|
|
+ pr_err("Failed to request resources for %s (irq %d) on irqchip %s\n",
|
|
|
+ new->name, irq, desc->irq_data.chip->name);
|
|
|
+ goto out_mutex;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
chip_bus_lock(desc);
|
|
|
|
|
@@ -1271,13 +1279,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
|
|
|
}
|
|
|
|
|
|
if (!shared) {
|
|
|
- ret = irq_request_resources(desc);
|
|
|
- if (ret) {
|
|
|
- pr_err("Failed to request resources for %s (irq %d) on irqchip %s\n",
|
|
|
- new->name, irq, desc->irq_data.chip->name);
|
|
|
- goto out_unlock;
|
|
|
- }
|
|
|
-
|
|
|
init_waitqueue_head(&desc->wait_for_threads);
|
|
|
|
|
|
/* Setup the type (level, edge polarity) if configured: */
|
|
@@ -1386,6 +1387,10 @@ out_unlock:
|
|
|
|
|
|
chip_bus_sync_unlock(desc);
|
|
|
|
|
|
+ if (!desc->action)
|
|
|
+ irq_release_resources(desc);
|
|
|
+
|
|
|
+out_mutex:
|
|
|
mutex_unlock(&desc->request_mutex);
|
|
|
|
|
|
out_thread:
|
|
@@ -1484,7 +1489,6 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
|
|
|
if (!desc->action) {
|
|
|
irq_settings_clr_disable_unlazy(desc);
|
|
|
irq_shutdown(desc);
|
|
|
- irq_release_resources(desc);
|
|
|
irq_remove_timings(desc);
|
|
|
}
|
|
|
|
|
@@ -1527,6 +1531,9 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (!desc->action)
|
|
|
+ irq_release_resources(desc);
|
|
|
+
|
|
|
mutex_unlock(&desc->request_mutex);
|
|
|
|
|
|
irq_chip_pm_put(&desc->irq_data);
|