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
0af9479e
Commit
0af9479e
authored
Nov 17, 2002
by
James Bottomley
Browse files
Options
Browse Files
Download
Plain Diff
Merge mulgrave.(none):/home/jejb/BK/scsi-misc-2.5
into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5
parents
39ff498d
e822432e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
drivers/scsi/scsi.c
drivers/scsi/scsi.c
+2
-7
No files found.
drivers/scsi/scsi.c
View file @
0af9479e
...
...
@@ -1673,7 +1673,7 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length,
from_length
=
strlen
(
from
);
strncpy
(
to
,
from
,
min
(
to_length
,
from_length
));
if
(
from_length
<
to_length
)
if
(
from_length
<
to_length
)
{
if
(
compatible
)
{
/*
* NUL terminate the string if it is short.
...
...
@@ -1686,6 +1686,7 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length,
strncpy
(
&
to
[
from_length
],
spaces
,
to_length
-
from_length
);
}
}
if
(
from_length
>
to_length
)
printk
(
KERN_WARNING
"%s: %s string '%s' is too long
\n
"
,
__FUNCTION__
,
name
,
from
);
...
...
@@ -1917,12 +1918,6 @@ int scsi_attach_device(struct scsi_device *sdev)
}
up_read
(
&
scsi_devicelist_mutex
);
return
0
;
fail:
printk
(
KERN_ERR
"%s: Allocation failure during SCSI scanning, "
"some SCSI devices might not be configured
\n
"
,
__FUNCTION__
);
return
-
ENOMEM
;
}
void
scsi_detach_device
(
struct
scsi_device
*
sdev
)
...
...
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