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-cd_ioctl.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-cd_ioctl.c')
| -rw-r--r-- | drivers/ide/ide-cd_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c index 55cd736c39c6..2acca12b9c94 100644 --- a/drivers/ide/ide-cd_ioctl.c +++ b/drivers/ide/ide-cd_ioctl.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * cdrom.c IOCTLs handling for ide-cd driver. * @@ -304,7 +305,6 @@ int ide_cdrom_reset(struct cdrom_device_info *cdi) int ret; rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM); - scsi_req_init(rq); ide_req(rq)->type = ATA_PRIV_MISC; rq->rq_flags = RQF_QUIET; blk_execute_rq(drive->queue, cd->disk, rq, 0); |