diff options
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 4fa9487a8720..477a20817d08 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c | |||
| @@ -1868,7 +1868,6 @@ static void omapfb_free_resources(struct omapfb2_device *fbdev) | |||
| 1868 | } | 1868 | } |
| 1869 | 1869 | ||
| 1870 | dev_set_drvdata(fbdev->dev, NULL); | 1870 | dev_set_drvdata(fbdev->dev, NULL); |
| 1871 | kfree(fbdev); | ||
| 1872 | } | 1871 | } |
| 1873 | 1872 | ||
| 1874 | static int omapfb_create_framebuffers(struct omapfb2_device *fbdev) | 1873 | static int omapfb_create_framebuffers(struct omapfb2_device *fbdev) |
| @@ -2413,7 +2412,8 @@ static int __init omapfb_probe(struct platform_device *pdev) | |||
| 2413 | goto err0; | 2412 | goto err0; |
| 2414 | } | 2413 | } |
| 2415 | 2414 | ||
| 2416 | fbdev = kzalloc(sizeof(struct omapfb2_device), GFP_KERNEL); | 2415 | fbdev = devm_kzalloc(&pdev->dev, sizeof(struct omapfb2_device), |
| 2416 | GFP_KERNEL); | ||
| 2417 | if (fbdev == NULL) { | 2417 | if (fbdev == NULL) { |
| 2418 | r = -ENOMEM; | 2418 | r = -ENOMEM; |
| 2419 | goto err0; | 2419 | goto err0; |
