diff options
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r-- | drivers/ata/ahci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 5064f3ea20f1..db4380d70031 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -1146,11 +1146,18 @@ int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis) | |||
1146 | return rc; | 1146 | return rc; |
1147 | 1147 | ||
1148 | for (i = 0; i < host->n_ports; i++) { | 1148 | for (i = 0; i < host->n_ports; i++) { |
1149 | const char* desc; | ||
1149 | struct ahci_port_priv *pp = host->ports[i]->private_data; | 1150 | struct ahci_port_priv *pp = host->ports[i]->private_data; |
1150 | 1151 | ||
1152 | /* pp is NULL for dummy ports */ | ||
1153 | if (pp) | ||
1154 | desc = pp->irq_desc; | ||
1155 | else | ||
1156 | desc = dev_driver_string(host->dev); | ||
1157 | |||
1151 | rc = devm_request_threaded_irq(host->dev, | 1158 | rc = devm_request_threaded_irq(host->dev, |
1152 | irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED, | 1159 | irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED, |
1153 | pp->irq_desc, host->ports[i]); | 1160 | desc, host->ports[i]); |
1154 | if (rc) | 1161 | if (rc) |
1155 | goto out_free_irqs; | 1162 | goto out_free_irqs; |
1156 | } | 1163 | } |