Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29512
b: refs/heads/master
c: 39b07ce
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik committed Jun 12, 2006
1 parent 40be92a commit 1a012a0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 233277cad6dacca6a8e53743641cf43ef7f37c4a
refs/heads/master: 39b07ce6d9f7cd4da8567baed844801e0aaa7b1a
9 changes: 7 additions & 2 deletions trunk/drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5293,6 +5293,7 @@ int ata_device_add(const struct ata_probe_ent *ent)
unsigned int count = 0, i;
struct device *dev = ent->dev;
struct ata_host_set *host_set;
int rc;

DPRINTK("ENTER\n");
/* alloc a container for our list of ATA ports (buses) */
Expand Down Expand Up @@ -5344,9 +5345,13 @@ int ata_device_add(const struct ata_probe_ent *ent)
goto err_free_ret;

/* obtain irq, that is shared between channels */
if (request_irq(ent->irq, ent->port_ops->irq_handler, ent->irq_flags,
DRV_NAME, host_set))
rc = request_irq(ent->irq, ent->port_ops->irq_handler, ent->irq_flags,
DRV_NAME, host_set);
if (rc) {
dev_printk(KERN_ERR, dev, "irq %lu request failed: %d\n",
ent->irq, rc);
goto err_out;
}

/* perform each probe synchronously */
DPRINTK("probe begin\n");
Expand Down

0 comments on commit 1a012a0

Please sign in to comment.