diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 15:17:52 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 15:17:52 -0800 |
commit | 17cb3be61b45d716f6b21a9380925493413ce0ed (patch) | |
tree | d29ca8bc010a22f358032346d7e7b6887c455e08 /drivers/staging/imx-drm/imx-drm-core.c | |
parent | d7f9729f6e06c9613a88a18c4e1fbbdf2f6146fd (diff) | |
parent | e16a922a27ec352537a8027cadc32dc156534ca5 (diff) |
Merge branch 'staging-linus' into staging-next
This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.
It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm/imx-drm-core.c')
-rw-r--r-- | drivers/staging/imx-drm/imx-drm-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index ecf0f44bc70..cec19f1cf56 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -584,7 +584,6 @@ int imx_drm_add_encoder(struct drm_encoder *encoder, ret = imx_drm_encoder_register(imx_drm_encoder); if (ret) { - kfree(imx_drm_encoder); ret = -ENOMEM; goto err_register; } |