Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
b11d0e48
Commit
b11d0e48
authored
Dec 12, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
parents
47807ce3
dfa15988
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+2
-2
No files found.
drivers/scsi/libata-core.c
View file @
b11d0e48
...
...
@@ -2443,7 +2443,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
struct
scatterlist
*
psg
=
&
qc
->
pad_sgent
;
void
*
addr
=
kmap_atomic
(
psg
->
page
,
KM_IRQ0
);
memcpy
(
addr
+
psg
->
offset
,
pad_buf
,
qc
->
pad_len
);
kunmap_atomic
(
psg
->
page
,
KM_IRQ0
);
kunmap_atomic
(
addr
,
KM_IRQ0
);
}
}
else
{
if
(
sg_dma_len
(
&
sg
[
0
])
>
0
)
...
...
@@ -2717,7 +2717,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
if
(
qc
->
tf
.
flags
&
ATA_TFLAG_WRITE
)
{
void
*
addr
=
kmap_atomic
(
psg
->
page
,
KM_IRQ0
);
memcpy
(
pad_buf
,
addr
+
psg
->
offset
,
qc
->
pad_len
);
kunmap_atomic
(
psg
->
page
,
KM_IRQ0
);
kunmap_atomic
(
addr
,
KM_IRQ0
);
}
sg_dma_address
(
psg
)
=
ap
->
pad_dma
+
(
qc
->
tag
*
ATA_DMA_PAD_SZ
);
...
...
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