Update of /cvsroot/linux-vax/kernel-2.4/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv24917/drivers/scsi
Modified Files:
Makefile scsi_ioctl.c
Log Message:
Merge 2.4.19
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 10 Jun 2003 01:46:52 -0000 1.6
+++ Makefile 21 Sep 2003 13:12:30 -0000 1.7
@@ -67,7 +67,7 @@
obj-$(CONFIG_SCSI_AACRAID) += aacraid/aacraid.o
endif
ifeq ($(CONFIG_SCSI_AIC7XXX),y)
-obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/aic7xxx_drv.o
+ obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/aic7xxx.o
endif
obj-$(CONFIG_SCSI_AIC7XXX_OLD) += aic7xxx_old.o
obj-$(CONFIG_SCSI_IPS) += ips.o
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scsi_ioctl.c 11 Apr 2002 13:05:52 -0000 1.2
+++ scsi_ioctl.c 21 Sep 2003 13:12:30 -0000 1.3
@@ -378,9 +378,12 @@
scsi_ioctl_get_pci(Scsi_Device * dev, void *arg)
{
- 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->host->pci_dev)
+ return -ENXIO;
+ if(copy_to_user(arg, dev->host->pci_dev->slot_name,
+ sizeof(dev->host->pci_dev->slot_name)))
+ return -EFAULT;
+ return 0;
}
#else
static int
|
