git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-linus
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
libsas
/
sas_scsi_host.c
diff --git
a/drivers/scsi/libsas/sas_scsi_host.c
b/drivers/scsi/libsas/sas_scsi_host.c
index
7448387
..
1c558d3
100644
(file)
--- 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_s
csi_ioctl(
sdev, cmd, arg);
+ return ata_s
as_scsi_ioctl(dev->sata_dev.ap,
sdev, cmd, arg);
return -EINVAL;
}