Merge "mmc: card: Fix NULL pointer dereference in mmc_blk_ioctl_rpmb_cmd()" (dbc238f4) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/card/block.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -817,7 +817,7 @@ static int mmc_blk_ioctl_rpmb_cmd(struct block_device *bdev,
		{
		struct mmc_blk_ioc_rpmb_data *idata;
		struct mmc_blk_data *md;
		struct mmc_card *card;
		struct mmc_card *card = NULL;
		struct mmc_command cmd = {0};
		struct mmc_data data = {0};
		struct mmc_request mrq = {NULL};
		@@ -973,7 +973,7 @@ idata_free:

		cmd_done:
		mmc_blk_put(md);
		if (card->cmdq_init)
		if (card && card->cmdq_init)
		wake_up(&card->host->cmdq_ctx.wait);
		return err;
		}