Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/scsi
Modified Files:
Makefile scsi_ioctl.c
Log Message:
Merge with 2.5.51
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile 19 Jun 2003 23:31:47 -0000 1.16
+++ Makefile 7 Jul 2003 23:47:31 -0000 1.17
@@ -129,7 +129,8 @@
obj-$(CONFIG_CHR_DEV_SG) += sg.o
scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \
- scsi_error.o scsi_lib.o scsi_scan.o scsi_syms.o
+ scsi_error.o scsi_lib.o scsi_scan.o scsi_syms.o \
+ scsi_sysfs.o
ifdef CONFIG_PROC_FS
scsi_mod-objs += scsi_proc.o
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scsi_ioctl.c 26 Mar 2003 00:06:47 -0000 1.10
+++ scsi_ioctl.c 7 Jul 2003 23:47:31 -0000 1.11
@@ -394,12 +394,13 @@
* any copy_to_user() error on failure there
*/
static int
-scsi_ioctl_get_pci(Scsi_Device * dev, void *arg)
+scsi_ioctl_get_pci(Scsi_Device * sdev, void *arg)
{
+ struct device *dev = scsi_get_device(sdev->host);
- if (!dev->host->pci_dev) return -ENXIO;
- return copy_to_user(arg, dev->host->pci_dev->slot_name,
- sizeof(dev->host->pci_dev->slot_name));
+ if (!dev) return -ENXIO;
+ return copy_to_user(arg, dev->bus_id,
+ sizeof(dev->bus_id));
}
#else
static int
|
