diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 10:01:28 (GMT) |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 10:01:28 (GMT) |
| commit | 19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5 (patch) | |
| tree | ab5e98ae677baecab3155b34983d97ffd08281c0 /drivers/video/mmp | |
| parent | b75bf98b5d2b7fdb876d3dd7eaec8246d4cc7174 (diff) | |
| parent | 464d8a54a0ca7827a2278e2122e5eb22462ae044 (diff) | |
| download | linux-fsl-qoriq-19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5.tar.xz | |
Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next
Various fbdev changes for 3.11
* xilinxfb updates
* Small cleanups and fixes to multiple drivers
Diffstat (limited to 'drivers/video/mmp')
| -rw-r--r-- | drivers/video/mmp/fb/mmpfb.c | 1 | ||||
| -rw-r--r-- | drivers/video/mmp/hw/mmp_ctrl.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/mmp/fb/mmpfb.c b/drivers/video/mmp/fb/mmpfb.c index 6d1fa96..4ab95b8 100644 --- a/drivers/video/mmp/fb/mmpfb.c +++ b/drivers/video/mmp/fb/mmpfb.c @@ -659,7 +659,6 @@ failed_destroy_mutex: mutex_destroy(&fbi->access_ok); failed: dev_err(fbi->dev, "mmp-fb: frame buffer device init failed\n"); - platform_set_drvdata(pdev, NULL); framebuffer_release(info); diff --git a/drivers/video/mmp/hw/mmp_ctrl.c b/drivers/video/mmp/hw/mmp_ctrl.c index 8612590..75dca19 100644 --- a/drivers/video/mmp/hw/mmp_ctrl.c +++ b/drivers/video/mmp/hw/mmp_ctrl.c @@ -566,7 +566,6 @@ failed: devm_kfree(ctrl->dev, ctrl); } - platform_set_drvdata(pdev, NULL); dev_err(&pdev->dev, "device init failed\n"); return ret; |