From: Chunbo Luo <chunbo.luo@xxxxxxxxxxxxx> Previously, queue_delayed_work() was started unconditionally, but if ATA_PFLAG_SCSI_HOTPLUG is not set and we do this, the work queue may cause multiple messages like this: ata3.00: WARNING: ATAPI is not supported with this driver, device ignored. So now,it is only started when the hotplug flag is actually set. Signed-off-by: Chunbo Luo <chunbo.luo@xxxxxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ata/libata-scsi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/ata/libata-scsi.c~libata-scsi-dont-start-hotplug-work-queue-if-hotplug-is-disabled drivers/ata/libata-scsi.c --- a/drivers/ata/libata-scsi.c~libata-scsi-dont-start-hotplug-work-queue-if-hotplug-is-disabled +++ a/drivers/ata/libata-scsi.c @@ -3176,8 +3176,9 @@ void ata_scsi_scan_host(struct ata_port " switching to async\n"); } - queue_delayed_work(ata_aux_wq, &ap->hotplug_task, - round_jiffies_relative(HZ)); + if (ap->pflags & ATA_PFLAG_SCSI_HOTPLUG) + queue_delayed_work(ata_aux_wq, &ap->hotplug_task, + round_jiffies_relative(HZ)); } /** _ -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
