Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96958
b: refs/heads/master
c: c85665f
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik authored and Jeff Garzik committed May 19, 2008
1 parent 2c8d710 commit a55cbcc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 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: ae6c23c4e1ec9720b99e1e6850fe47c6c7fddbb3
refs/heads/master: c85665ffa8e351a5b38f8e4ceaec527d8783c970
8 changes: 4 additions & 4 deletions trunk/drivers/ata/libata-acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap)
ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
}

static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device
static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device
*dev, u32 event)
{
char event_string[12];
Expand All @@ -130,7 +130,7 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device
acpi_handle handle, tmphandle;
unsigned long sta;
acpi_status status;

if (!ap)
ap = dev->link->ap;
ehi = &ap->link.eh_info;
Expand Down Expand Up @@ -167,10 +167,10 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device
else {
struct ata_link *tlink;
struct ata_device *tdev;

ata_port_for_each_link(tlink, ap) {
ata_link_for_each_dev(tdev, tlink) {
tdev->flags |=
tdev->flags |=
ATA_DFLAG_DETACH;
}
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/ata/pata_sl82c105.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static int sl82c105_qc_defer(struct ata_queued_cmd *qc)
struct ata_port *alt = host->ports[1 ^ qc->ap->port_no];
int rc;

/* First apply the usual rules */
/* First apply the usual rules */
rc = ata_std_qc_defer(qc);
if (rc != 0)
return rc;
Expand Down

0 comments on commit a55cbcc

Please sign in to comment.