diff options
author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /drivers/cdrom/cdrom.c | |
parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'drivers/cdrom/cdrom.c')
-rw-r--r-- | drivers/cdrom/cdrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 9deca49c71f0..beaa561f2ed8 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
@@ -645,7 +645,7 @@ static int cdrom_mrw_exit(struct cdrom_device_info *cdi) | |||
645 | ret = cdrom_mrw_bgformat_susp(cdi, 0); | 645 | ret = cdrom_mrw_bgformat_susp(cdi, 0); |
646 | } | 646 | } |
647 | 647 | ||
648 | if (!ret) | 648 | if (!ret && cdi->media_written) |
649 | ret = cdrom_flush_cache(cdi); | 649 | ret = cdrom_flush_cache(cdi); |
650 | 650 | ||
651 | return ret; | 651 | return ret; |