Merge remote-tracking branch 'mmc/mmc-next'

[karo-tx-linux.git] / drivers / mmc / card / block.c

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 4c1a648d00fcfbc156f62c4a551daaf368db88f8..9b90726366876306667072342e4fdee1351dd9b7 100644 (file)
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -291,7 +291,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
        struct mmc_card *card;
        struct mmc_command cmd = {0};
        struct mmc_data data = {0};
-       struct mmc_request mrq = {0};
+       struct mmc_request mrq = {NULL};
        struct scatterlist sg;
        int err;
 
@@ -466,7 +466,7 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
        u32 result;
        __be32 *blocks;
 
-       struct mmc_request mrq = {0};
+       struct mmc_request mrq = {NULL};
        struct mmc_command cmd = {0};
        struct mmc_data data = {0};
        unsigned int timeout_us;