Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[~andy/linux] / drivers / cdrom / cdrom.c

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 9deca49c71f03cef89498a1e9e3e3ba7483e3ac8..beaa561f2ed888ad6780699b4ffb15bdc8796c93 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -645,7 +645,7 @@ static int cdrom_mrw_exit(struct cdrom_device_info *cdi)
                ret = cdrom_mrw_bgformat_susp(cdi, 0);
        }
 
-       if (!ret)
+       if (!ret && cdi->media_written)
                ret = cdrom_flush_cache(cdi);
 
        return ret;