diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-10 10:00:18 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-10 10:00:18 +0900 |
| commit | 4dc6758d7824a6d25717ccceefc488cafdb07210 (patch) | |
| tree | 992e5d5996910af35a5c12fe94da14d0bb167452 /drivers/ide/ide-cd.c | |
| parent | 19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8 (diff) | |
| parent | 3fefc31843cfe2b5f072efe11ed9ccaf6a7a5092 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.
Must easier to resolve this time.
Which probably means that I screwed it up somehow.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index a7355ab3bb22..6ff0be8cbdc9 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -867,11 +867,16 @@ static void msf_from_bcd(struct atapi_msf *msf) int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense) { struct cdrom_info *info = drive->driver_data; - struct cdrom_device_info *cdi = &info->devinfo; + struct cdrom_device_info *cdi; unsigned char cmd[BLK_MAX_CDB]; ide_debug_log(IDE_DBG_FUNC, "enter"); + if (!info) + return -EIO; + + cdi = &info->devinfo; + memset(cmd, 0, BLK_MAX_CDB); cmd[0] = GPCMD_TEST_UNIT_READY; |