diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-14 02:10:13 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-14 02:10:13 +0100 |
commit | c25141062a82ae8bddced1b3ce2b57a1c0efabe0 (patch) | |
tree | 105edf10059bc0c4f2f00338b0c861b813d1bb1a /drivers/ide/ide-devsets.c | |
parent | Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3 (diff) | |
parent | Input: gamecon - mark expected switch fall-throughs (diff) | |
download | linux-c25141062a82ae8bddced1b3ce2b57a1c0efabe0.tar.xz linux-c25141062a82ae8bddced1b3ce2b57a1c0efabe0.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.15 merge window.
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 9b69c32ee560..4e20747af32e 100644 --- a/drivers/ide/ide-devsets.c +++ b/drivers/ide/ide-devsets.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/kernel.h> #include <linux/gfp.h> @@ -166,7 +167,6 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting, return setting->set(drive, arg); rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM); - scsi_req_init(rq); ide_req(rq)->type = ATA_PRIV_MISC; scsi_req(rq)->cmd_len = 5; scsi_req(rq)->cmd[0] = REQ_DEVSET_EXEC; |