summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_ioctl.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-29 01:41:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-29 01:41:54 +0000
commitf969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch)
treeb3530d803df59d726afaabebc6626987dee1ca05 /drivers/scsi/scsi_ioctl.c
parenta10ce7ef2066b455d69187643ddf2073bfc4db24 (diff)
Merge with 2.3.27.
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
-rw-r--r--drivers/scsi/scsi_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index d9abefc1b..1671bd16c 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -404,7 +404,7 @@ int scsi_ioctl(Scsi_Device * dev, int cmd, void *arg)
put_user(dev->id
+ (dev->lun << 8)
+ (dev->channel << 16)
- + ((dev->host->hostt->proc_dir->low_ino & 0xff) << 24),
+ + ((dev->host->host_no & 0xff) << 24),
&((Scsi_Idlun *) arg)->dev_id);
put_user(dev->host->unique_id, &((Scsi_Idlun *) arg)->host_unique_id);
return 0;