From 6cc2a8d1b2da8ced19f4b0d6d313dfd06b481f29 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 24 Jan 2011 11:23:15 -0300 Subject: [PATCH] --- yaml --- r: 242105 b: refs/heads/master c: 868e90d55c0eb6f3c5949c2a747714072c3e080a h: refs/heads/master i: 242103: b932fcddda62426bd41017b6a49c17981192a56c v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/radio-wl1273.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8ca5526e28e0..82b8bf1b8e01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e270941c8f0a11224e383d3d38946451f66fbbf +refs/heads/master: 868e90d55c0eb6f3c5949c2a747714072c3e080a diff --git a/trunk/drivers/media/radio/radio-wl1273.c b/trunk/drivers/media/radio/radio-wl1273.c index 9e177dccc673..46cacf845049 100644 --- a/trunk/drivers/media/radio/radio-wl1273.c +++ b/trunk/drivers/media/radio/radio-wl1273.c @@ -67,7 +67,6 @@ struct wl1273_device { /* RDS */ unsigned int rds_on; - struct delayed_work work; wait_queue_head_t read_queue; struct mutex lock; /* for serializing fm radio operations */ @@ -967,9 +966,6 @@ static int wl1273_fm_rds_off(struct wl1273_device *radio) if (r) goto out; - /* stop rds reception */ - cancel_delayed_work(&radio->work); - /* Service pending read */ wake_up_interruptible(&radio->read_queue); @@ -2171,7 +2167,6 @@ module_init(wl1273_fm_module_init); static void __exit wl1273_fm_module_exit(void) { - flush_scheduled_work(); platform_driver_unregister(&wl1273_fm_radio_driver); pr_info(DRIVER_DESC ", Exiting.\n"); }