OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[uclinux-h8/linux.git]
/
drivers
/
block
/
paride
/
pd.c
diff --git
a/drivers/block/paride/pd.c
b/drivers/block/paride/pd.c
index
d79c490
..
b9242d7
100644
(file)
--- a/
drivers/block/paride/pd.c
+++ b/
drivers/block/paride/pd.c
@@
-444,7
+444,7
@@
static char *pd_buf; /* buffer for request in progress */
static enum action do_pd_io_start(void)
{
static enum action do_pd_io_start(void)
{
- if (pd_req->cmd_type == REQ_TYPE_
SPECIAL
) {
+ if (pd_req->cmd_type == REQ_TYPE_
DRV_PRIV
) {
phase = pd_special;
return pd_special();
}
phase = pd_special;
return pd_special();
}
@@
-727,7
+727,7
@@
static int pd_special_command(struct pd_unit *disk,
if (IS_ERR(rq))
return PTR_ERR(rq);
if (IS_ERR(rq))
return PTR_ERR(rq);
- rq->cmd_type = REQ_TYPE_
SPECIAL
;
+ rq->cmd_type = REQ_TYPE_
DRV_PRIV
;
rq->special = func;
err = blk_execute_rq(disk->gd->queue, disk->gd, rq, 0);
rq->special = func;
err = blk_execute_rq(disk->gd->queue, disk->gd, rq, 0);