Commit 3b76b263 authored by James Bottomley's avatar James Bottomley

Merge raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5
parents 69a9afd5 06675f78
......@@ -4211,7 +4211,7 @@ static int os_scsi_tape_open(struct inode * inode, struct file * filp)
unsigned short flags;
int i, b_size, new_session = FALSE, retval = 0;
unsigned char cmd[MAX_COMMAND_SIZE];
Scsi_Request * SRpnt;
Scsi_Request * SRpnt = NULL;
OS_Scsi_Tape * STp;
ST_mode * STm;
ST_partstat * STps;
......
......@@ -19,7 +19,7 @@
*/
#include <linux/config.h>
#ifdef CONFIG_PROC_FS
static char *sg_version_str = "Version: 3.5.27 (20020812)";
static char *sg_version_str = "Version: 3.5.27 (20030130)";
#endif
static int sg_version_num = 30527; /* 2 digits for each component */
/*
......@@ -1455,9 +1455,9 @@ sg_attach(Scsi_Device * scsidp)
sdp->sg_tablesize = scsidp->host ? scsidp->host->sg_tablesize : 0;
memset(&sdp->sg_driverfs_dev, 0, sizeof (struct device));
sprintf(sdp->sg_driverfs_dev.bus_id, "%s:gen",
snprintf(sdp->sg_driverfs_dev.bus_id, BUS_ID_SIZE, "%s:gen",
scsidp->sdev_driverfs_dev.bus_id);
sprintf(sdp->sg_driverfs_dev.name, "%sgeneric",
snprintf(sdp->sg_driverfs_dev.name, DEVICE_NAME_SIZE, "%sgeneric",
scsidp->sdev_driverfs_dev.name);
sdp->sg_driverfs_dev.parent = &scsidp->sdev_driverfs_dev;
sdp->sg_driverfs_dev.bus = scsidp->sdev_driverfs_dev.bus;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment