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
Kirill Smelkov
linux
Commits
a2c78f7c
Commit
a2c78f7c
authored
Nov 05, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
parents
6037d6bb
d191634f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
drivers/mmc/mmc_block.c
drivers/mmc/mmc_block.c
+0
-1
drivers/mmc/wbsd.c
drivers/mmc/wbsd.c
+8
-7
No files found.
drivers/mmc/mmc_block.c
View file @
a2c78f7c
...
@@ -203,7 +203,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
...
@@ -203,7 +203,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
brq
.
data
.
flags
|=
MMC_DATA_READ
;
brq
.
data
.
flags
|=
MMC_DATA_READ
;
}
else
{
}
else
{
brq
.
cmd
.
opcode
=
MMC_WRITE_BLOCK
;
brq
.
cmd
.
opcode
=
MMC_WRITE_BLOCK
;
brq
.
cmd
.
flags
=
MMC_RSP_R1B
;
brq
.
data
.
flags
|=
MMC_DATA_WRITE
;
brq
.
data
.
flags
|=
MMC_DATA_WRITE
;
brq
.
data
.
blocks
=
1
;
brq
.
data
.
blocks
=
1
;
}
}
...
...
drivers/mmc/wbsd.c
View file @
a2c78f7c
...
@@ -201,7 +201,7 @@ static void wbsd_reset(struct wbsd_host* host)
...
@@ -201,7 +201,7 @@ static void wbsd_reset(struct wbsd_host* host)
{
{
u8
setup
;
u8
setup
;
printk
(
KERN_ERR
DRIVER_NAME
": Resetting chip
\n
"
);
printk
(
KERN_ERR
"%s: Resetting chip
\n
"
,
mmc_hostname
(
host
->
mmc
)
);
/*
/*
* Soft reset of chip (SD/MMC part).
* Soft reset of chip (SD/MMC part).
...
@@ -880,8 +880,9 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
...
@@ -880,8 +880,9 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
*/
*/
if
(
count
)
if
(
count
)
{
{
printk
(
KERN_ERR
DRIVER_NAME
": Incomplete DMA "
printk
(
KERN_ERR
"%s: Incomplete DMA transfer. "
"transfer. %d bytes left.
\n
"
,
count
);
"%d bytes left.
\n
"
,
mmc_hostname
(
host
->
mmc
),
count
);
data
->
error
=
MMC_ERR_FAILED
;
data
->
error
=
MMC_ERR_FAILED
;
}
}
...
@@ -1169,8 +1170,8 @@ static void wbsd_tasklet_card(unsigned long param)
...
@@ -1169,8 +1170,8 @@ static void wbsd_tasklet_card(unsigned long param)
if
(
host
->
mrq
)
if
(
host
->
mrq
)
{
{
printk
(
KERN_ERR
DRIVER_NAME
printk
(
KERN_ERR
"%s: Card removed during transfer!
\n
"
,
": Card removed during transfer!
\n
"
);
mmc_hostname
(
host
->
mmc
)
);
wbsd_reset
(
host
);
wbsd_reset
(
host
);
host
->
mrq
->
cmd
->
error
=
MMC_ERR_FAILED
;
host
->
mrq
->
cmd
->
error
=
MMC_ERR_FAILED
;
...
@@ -1852,9 +1853,9 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
...
@@ -1852,9 +1853,9 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
/*
/*
* See if chip needs to be configured.
* See if chip needs to be configured.
*/
*/
if
(
pnp
&&
(
host
->
config
!=
0
)
)
if
(
pnp
)
{
{
if
(
!
wbsd_chip_validate
(
host
))
if
(
(
host
->
config
!=
0
)
&&
!
wbsd_chip_validate
(
host
))
{
{
printk
(
KERN_WARNING
DRIVER_NAME
printk
(
KERN_WARNING
DRIVER_NAME
": PnP active but chip not configured! "
": PnP active but chip not configured! "
...
...
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