diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2009-01-16 10:17:09 -0500 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@redhat.com> | 2009-01-16 10:17:09 -0500 |
| commit | 94be9a58d7e683ac3c1df1858a17f09ebade8da0 (patch) | |
| tree | 2f346bb4d179caf1cf0f61012f35c8277504c55a /drivers/scsi/libsas | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| download | linux-dev-94be9a58d7e683ac3c1df1858a17f09ebade8da0.tar.xz linux-dev-94be9a58d7e683ac3c1df1858a17f09ebade8da0.zip | |
[libata] get-identity ioctl: Fix use of invalid memory pointer
for SAS drivers.
Caught by Ke Wei (and team?) at Marvell.
Also, move the ata_scsi_ioctl export to libata-scsi.c, as that seems to be the
general trend.
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/scsi/libsas')
| -rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 744838780ada..1c558d3bce18 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -717,7 +717,7 @@ int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) struct domain_device *dev = sdev_to_domain_dev(sdev); if (dev_is_sata(dev)) - return ata_scsi_ioctl(sdev, cmd, arg); + return ata_sas_scsi_ioctl(dev->sata_dev.ap, sdev, cmd, arg); return -EINVAL; } |