cdrom: track if a cdrom_device_info was opened for data

[sfrench/cifs-2.6.git] / drivers / cdrom / cdrom.c

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 08abf1ffede0020adfc2fc81d93c75cb60d1fff2..adebac1bd210d92f03b8257f41ab94a62d92b57f 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1172,6 +1172,7 @@ int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode)
                        ret = 0;
                        cdi->media_written = 0;
                }
+               cdi->opened_for_data = true;
        }
 
        if (ret)
@@ -1252,7 +1253,6 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,
 void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode)
 {
        const struct cdrom_device_ops *cdo = cdi->ops;
-       int opened_for_data;
 
        cd_dbg(CD_CLOSE, "entering cdrom_release\n");
 
@@ -1270,14 +1270,12 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode)
                }
        }
 
-       opened_for_data = !(cdi->options & CDO_USE_FFLAGS) ||
-               !(mode & FMODE_NDELAY);
-
        cdo->release(cdi);
-       if (cdi->use_count == 0) {      /* last process that closes dev*/
-               if (opened_for_data &&
-                   cdi->options & CDO_AUTO_EJECT && CDROM_CAN(CDC_OPEN_TRAY))
+
+       if (cdi->use_count == 0 && cdi->opened_for_data) {
+               if (cdi->options & CDO_AUTO_EJECT && CDROM_CAN(CDC_OPEN_TRAY))
                        cdo->tray_move(cdi, 1);
+               cdi->opened_for_data = false;
        }
 }
 EXPORT_SYMBOL(cdrom_release);