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/sata_vsc.c | |
| parent | 87507cfdd2cde397c9da8f6e7ec23b2b47ec53d6 (diff) | |
| parent | aa8f0dc6c3dbf1cf3ff58f3e945c981be134814d (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap
Diffstat (limited to 'drivers/scsi/sata_vsc.c')
| -rw-r--r-- | drivers/scsi/sata_vsc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index 05e0130a9f3c..c5e09dc6f3de 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c | |||
| @@ -231,6 +231,7 @@ static struct ata_port_operations vsc_sata_ops = { | |||
| 231 | .scr_write = vsc_sata_scr_write, | 231 | .scr_write = vsc_sata_scr_write, |
| 232 | .port_start = ata_port_start, | 232 | .port_start = ata_port_start, |
| 233 | .port_stop = ata_port_stop, | 233 | .port_stop = ata_port_stop, |
| 234 | .host_stop = ata_host_stop, | ||
| 234 | }; | 235 | }; |
| 235 | 236 | ||
| 236 | static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base) | 237 | static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base) |