Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3b76b263
Commit
3b76b263
authored
Feb 02, 2003
by
James Bottomley
Browse files
Options
Browse Files
Download
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/scsi/osst.c
drivers/scsi/osst.c
+1
-1
drivers/scsi/sg.c
drivers/scsi/sg.c
+3
-3
No files found.
drivers/scsi/osst.c
View file @
3b76b263
...
...
@@ -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
;
...
...
drivers/scsi/sg.c
View file @
3b76b263
...
...
@@ -19,7 +19,7 @@
*/
#include <linux/config.h>
#ifdef CONFIG_PROC_FS
static
char
*
sg_version_str
=
"Version: 3.5.27 (200
20812
)"
;
static
char
*
sg_version_str
=
"Version: 3.5.27 (200
30130
)"
;
#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
));
s
printf
(
sdp
->
sg_driverfs_dev
.
bus_id
,
"%s:gen"
,
s
nprintf
(
sdp
->
sg_driverfs_dev
.
bus_id
,
BUS_ID_SIZE
,
"%s:gen"
,
scsidp
->
sdev_driverfs_dev
.
bus_id
);
s
printf
(
sdp
->
sg_driverfs_dev
.
name
,
"%sgeneric"
,
s
nprintf
(
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment