diff options
| author | Tejun Heo <tj@kernel.org> | 2008-10-20 13:11:56 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-11-06 19:05:40 -0800 |
| commit | 052b0b637259e81fb17fbebd45db5098aef49c72 (patch) | |
| tree | dd4b85d8411c8c239758e9874bb3855a91bc5192 | |
| parent | 0c7e4714bce40c3e7f8890eda8fc6f83bff2595c (diff) | |
| download | lwn-052b0b637259e81fb17fbebd45db5098aef49c72.tar.gz lwn-052b0b637259e81fb17fbebd45db5098aef49c72.zip | |
libata: initialize port_task when !CONFIG_ATA_SFF
commit f667fdbbbea8bcce6cf9f7acb51b7cb4c264cc61 upstream
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/ata/libata-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 79e3a8e7a84a..8228ae3f8a16 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5259,6 +5259,8 @@ struct ata_port *ata_port_alloc(struct ata_host *host) #ifdef CONFIG_ATA_SFF INIT_DELAYED_WORK(&ap->port_task, ata_pio_task); +#else + INIT_DELAYED_WORK(&ap->port_task, NULL); #endif INIT_DELAYED_WORK(&ap->hotplug_task, ata_scsi_hotplug); INIT_WORK(&ap->scsi_rescan_task, ata_scsi_dev_rescan); |