mmc: wmt-sdmmc: Prevent NULL dereference for of_id->data
Subsystems (2)
PATCH 1/2 mmc: wmt-sdmmc: Prevent NULL dereference for of_id->data
Ensure having NULL checking for of_id before dereference of_id->data.
Signed-off-by Axel Lin <[email protected]>
--- drivers/mmc/host/wmt-sdmmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/wmt-sdmmc.c +2 -1
@@ -757,7 +757,7 @@ static int wmt_mci_probe(struct platform_device *pdev)struct device_node *np = pdev->dev.of_node;const struct of_device_id *of_id =of_match_device (wmt_mci_dt_ids, &pdev->dev); -const struct wmt_mci_caps *wmt_caps = of_id->data; +const struct wmt_mci_caps *wmt_caps;int ret;int regular_irq, dma_irq;
@@ -771,6 +771,7 @@ static int wmt_mci_probe(struct platform_device *pdev)return -EFAULT ; } + wmt_caps = of_id->data; regular_irq =irq_of_parse_and_map (np,0 ); dma_irq =irq_of_parse_and_map (np,1 );
Signature · 1 line
1.8.1.2
PATCH 2/2 mmc: wmt-sdmmc: Remove deprecated IRQF_DISABLED
It's a NOOP since 2.6.35 and it will be removed one day. This is not trivial because current code uses hard coded 32 instead of IRQF_DISABLED in the request_irq call.
Signed-off-by Axel Lin <[email protected]>
--- drivers/mmc/host/wmt-sdmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/wmt-sdmmc.c +1 -1
@@ -829,7 +829,7 @@ static int wmt_mci_probe(struct platform_device *pdev) goto fail3; } - ret =request_irq (dma_irq, wmt_mci_dma_isr,32 ,"sdmmc" , priv); + ret =request_irq (dma_irq, wmt_mci_dma_isr,0 ,"sdmmc" , priv);if (ret) {dev_err (&pdev->dev,"Register DMA IRQ fail\n" ); goto fail4;
Signature · 1 line
1.8.1.2