diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 07:30:39 +0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 07:30:39 +0400 |
commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /drivers/ata/ahci.c | |
parent | 3f0d0c9b47e09d47fcb755fed786a1ee88e110b5 (diff) | |
parent | 6c2580c501c660fdfb506061e016d84570fceba1 (diff) | |
download | linux-11489736177c5930514482b4db7af862d945335d.tar.xz |
Merge branch 'master' into virtio-next
The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window. So pull in master now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
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) return rc; for (i = 0; i < host->n_ports; i++) { + const char* desc; struct ahci_port_priv *pp = host->ports[i]->private_data; + /* pp is NULL for dummy ports */ + if (pp) + desc = pp->irq_desc; + else + desc = dev_driver_string(host->dev); + rc = devm_request_threaded_irq(host->dev, irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED, - pp->irq_desc, host->ports[i]); + desc, host->ports[i]); if (rc) goto out_free_irqs; } |