diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-29 14:24:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-29 14:24:57 -0400 |
| commit | d582c4ea307873503a68d6d7ab72ee8599e032a9 (patch) | |
| tree | 30b5ea37ba5803fe25815d14ee248be309975cb5 /drivers/scsi/ahci.c | |
| parent | 87507cfdd2cde397c9da8f6e7ec23b2b47ec53d6 (diff) | |
| parent | aa8f0dc6c3dbf1cf3ff58f3e945c981be134814d (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 8263b3a5d8d7..fc5263c6b102 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c | |||
| @@ -290,6 +290,8 @@ static void ahci_host_stop(struct ata_host_set *host_set) | |||
| 290 | { | 290 | { |
| 291 | struct ahci_host_priv *hpriv = host_set->private_data; | 291 | struct ahci_host_priv *hpriv = host_set->private_data; |
| 292 | kfree(hpriv); | 292 | kfree(hpriv); |
| 293 | |||
| 294 | ata_host_stop(host_set); | ||
| 293 | } | 295 | } |
| 294 | 296 | ||
| 295 | static int ahci_port_start(struct ata_port *ap) | 297 | static int ahci_port_start(struct ata_port *ap) |