Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c2a500d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: fix compilation error in dp catalog"

parents 868a1799 7bccbea6

drivers/gpu/drm/msm/dp/dp_catalog.c

+3 −4
Original line number Diff line number Diff line
@@ -1752,13 +1752,12 @@ void dp_catalog_put(struct dp_catalog *dp_catalog) 
	if (!dp_catalog)

		return;



	if (dp_catalog->priv.data && dp_catalog->priv.put)

		dp_catalog->priv.put(dp_catalog);



	catalog->parser->clear_io_buf(catalog->parser);

	catalog = container_of(dp_catalog, struct dp_catalog_private,

				dp_catalog);



	if (dp_catalog->priv.data && dp_catalog->priv.put)

		dp_catalog->priv.put(dp_catalog);



	catalog->parser->clear_io_buf(catalog->parser);

	devm_kfree(catalog->dev, catalog);

}

drivers/gpu/drm/msm/dp/dp_catalog_v420.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct dp_catalog_private_v420 { 
	char exe_mode[SZ_4];

};



static static u32 dp_read(struct dp_catalog_private_v420 *catalog,

static u32 dp_read(struct dp_catalog_private_v420 *catalog,

		struct dp_io_data *io_data, u32 offset)

{

	u32 data = 0;