[PATCH 1/6] ide-atapi: add a dev_is_idecd-inline

Borislav Petkov
2008-12-04T06:45:26Z

There should be no functionality change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
---
drivers/ide/ide-atapi.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 4e58b9e..33a1534 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -14,6 +14,12 @@
#define debug_log(fmt, args...) do {} while (0)
#endif

+static inline int dev_is_idecd(ide_drive_t *drive)
+{
+ return (drive->media == ide_cdrom || drive->media == ide_optical) &&
+ !(drive->dev_flags & IDE_DFLAG_SCSI);
+}
+
/*
* Check whether we can support a device,
* based on the ATAPI IDENTIFY command results.
@@ -577,7 +583,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,

if (scsi)
tf_flags = 0;
- else if (drive->media == ide_cdrom || drive->media == ide_optical)
+ else if (dev_is_idecd(drive))
tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
else
tf_flags = IDE_TFLAG_OUT_DEVICE;
--
1.6.0.4