aboutsummaryrefslogtreecommitdiff
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 15:59:06 +0100
committerTejun Heo <tj@kernel.org>2010-12-24 15:59:06 +0100
commit0ead5c86ac4c9903da93c76716135bc29d9cd83b (patch)
treeecb9ec44366c17a77e2c0cb20e75574e5e1b8b29 /drivers/cdrom
parent8aa0f413848708bca329c52358ae7a1a0e395b4e (diff)
downloadlinaro-lsk-0ead5c86ac4c9903da93c76716135bc29d9cd83b.tar.gz
gdrom: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush work on removal instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/gdrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index de65915308f..64a21461c40 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -837,7 +837,7 @@ probe_fail_no_mem:
static int __devexit remove_gdrom(struct platform_device *devptr)
{
- flush_scheduled_work();
+ flush_work_sync(&work);
blk_cleanup_queue(gd.gdrom_rq);
free_irq(HW_EVENT_GDROM_CMD, &gd);
free_irq(HW_EVENT_GDROM_DMA, &gd);