diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-16 14:30:09 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-16 14:30:09 +0400 |
| commit | e7d9facf0bab6d919342fea17c8cc0f65f8a0fe9 (patch) | |
| tree | 8301035b4dcb273c211c04fe2c0d1cbaf897021b /drivers/video/omap2/dss/dsi.c | |
| parent | 28bcd199cc4465733c1ac0c70135a385fff97c71 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| download | linux-e7d9facf0bab6d919342fea17c8cc0f65f8a0fe9.tar.xz | |
Merge tag 'v3.7-rc1'
Merge Linux 3.7-rc1 to get latest upstream changes.
Diffstat (limited to 'drivers/video/omap2/dss/dsi.c')
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index bbbafe370572..af07ec6a83bd 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -4521,7 +4521,7 @@ static void dsi_framedone_irq_callback(void *data, u32 mask) * and is sending the data. */ - __cancel_delayed_work(&dsi->framedone_timeout_work); + cancel_delayed_work(&dsi->framedone_timeout_work); dsi_handle_framedone(dsidev, 0); } @@ -5201,8 +5201,8 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) mutex_init(&dsi->lock); sema_init(&dsi->bus_lock, 1); - INIT_DELAYED_WORK_DEFERRABLE(&dsi->framedone_timeout_work, - dsi_framedone_timeout_work_callback); + INIT_DEFERRABLE_WORK(&dsi->framedone_timeout_work, + dsi_framedone_timeout_work_callback); #ifdef DSI_CATCH_MISSING_TE init_timer(&dsi->te_timer); |