diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /drivers/ide/ide-devsets.c | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'drivers/ide/ide-devsets.c')
| -rw-r--r-- | drivers/ide/ide-devsets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c index 9e98122f646e..b05a74d78ef5 100644 --- a/drivers/ide/ide-devsets.c +++ b/drivers/ide/ide-devsets.c | |||
| @@ -166,7 +166,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting, | |||
| 166 | return setting->set(drive, arg); | 166 | return setting->set(drive, arg); |
| 167 | 167 | ||
| 168 | rq = blk_get_request(q, READ, __GFP_WAIT); | 168 | rq = blk_get_request(q, READ, __GFP_WAIT); |
| 169 | rq->cmd_type = REQ_TYPE_SPECIAL; | 169 | rq->cmd_type = REQ_TYPE_DRV_PRIV; |
| 170 | rq->cmd_len = 5; | 170 | rq->cmd_len = 5; |
| 171 | rq->cmd[0] = REQ_DEVSET_EXEC; | 171 | rq->cmd[0] = REQ_DEVSET_EXEC; |
| 172 | *(int *)&rq->cmd[1] = arg; | 172 | *(int *)&rq->cmd[1] = arg; |