diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 14:19:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 14:19:27 +1000 |
| commit | 4752750a5b6713d61150c76382a2a68b545ddf2c (patch) | |
| tree | e244265a60adfa9b874fe31d93020cb5da8c50e6 /drivers/ata/libata-eh.c | |
| parent | 09ad584fed7e11e6fe0bf10e58626fc583d78111 (diff) | |
| parent | 40f2b6ffe525e975203c1621d4d4abaa7689b674 (diff) | |
Merge remote branch 'workqueues/for-next'
Conflicts:
fs/cifs/cifsfs.c
fs/cifs/cifsglob.h
fs/cifs/file.c
include/linux/libata.h
include/linux/workqueue.h
kernel/trace/Kconfig
kernel/workqueue.c
Diffstat (limited to 'drivers/ata/libata-eh.c')
| -rw-r--r-- | drivers/ata/libata-eh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 5cb6b1bb447e..287e5b78482e 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -729,7 +729,7 @@ void ata_scsi_error(struct Scsi_Host *host) if (ap->pflags & ATA_PFLAG_LOADING) ap->pflags &= ~ATA_PFLAG_LOADING; else if (ap->pflags & ATA_PFLAG_SCSI_HOTPLUG) - queue_delayed_work(ata_aux_wq, &ap->hotplug_task, 0); + schedule_delayed_work(&ap->hotplug_task, 0); if (ap->pflags & ATA_PFLAG_RECOVERED) ata_port_printk(ap, KERN_INFO, "EH complete\n"); @@ -2947,7 +2947,7 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, ehc->i.flags |= ATA_EHI_SETMODE; /* schedule the scsi_rescan_device() here */ - queue_work(ata_aux_wq, &(ap->scsi_rescan_task)); + schedule_work(&(ap->scsi_rescan_task)); } else if (dev->class == ATA_DEV_UNKNOWN && ehc->tries[dev->devno] && ata_class_enabled(ehc->classes[dev->devno])) { |