aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-10-20 00:11:56 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-10-22 20:40:01 -0400
commitf667fdbbbea8bcce6cf9f7acb51b7cb4c264cc61 (patch)
treeb8fe758137a54faf31dcdd97be0701dfbaf930fd /drivers/ata
parent2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff)
libata: initialize port_task when !CONFIG_ATA_SFF
ap->port_task was not initialized if !CONFIG_ATA_SFF later triggering lockdep warning. Make sure it's initialized. Reported by Larry Finger. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 1ee9499bd343..bbb3cae57492 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5373,6 +5373,8 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
5373 5373
5374#ifdef CONFIG_ATA_SFF 5374#ifdef CONFIG_ATA_SFF
5375 INIT_DELAYED_WORK(&ap->port_task, ata_pio_task); 5375 INIT_DELAYED_WORK(&ap->port_task, ata_pio_task);
5376#else
5377 INIT_DELAYED_WORK(&ap->port_task, NULL);
5376#endif 5378#endif
5377 INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug); 5379 INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug);
5378 INIT_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan); 5380 INIT_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan);