linux-cubox into drm-fixes

fix for leak in tda998x

* 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  drm/i2c: tda998x: Fix memory leak in tda998x_encoder_init error path.

parents 60f76eab 71c68c4f

drivers/gpu/drm/i2c/tda998x_drv.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1151,8 +1151,10 @@ tda998x_encoder_init(struct i2c_client *client,

		priv->current_page = 0xff;
		priv->cec = i2c_new_dummy(client->adapter, 0x34);
		if (!priv->cec)
		if (!priv->cec) {
		kfree(priv);
		return -ENODEV;
		}
		priv->dpms = DRM_MODE_DPMS_OFF;

		encoder_slave->slave_priv = priv;