[PATCH 05/31] staging: mt7621-mmc: Fix null pointer deref if ext sdio irq enabled

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The enable|disable_sdio_irq() fields of msdc_hw are never set, so when
they are called, they are null pointer. In case of the
MSDC_EXT_SDIO_IRQ flag set in msdc0_hw, this happens. But because
these fields are never set, they can simply be removed.

Signed-off-by: Christian Lütke-Stetzkamp <christian@xxxxxxxx>
---
 drivers/staging/mt7621-mmc/board.h | 4 ----
 drivers/staging/mt7621-mmc/sd.c    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h
index e4230770cd33..c4e014d01635 100644
--- a/drivers/staging/mt7621-mmc/board.h
+++ b/drivers/staging/mt7621-mmc/board.h
@@ -68,10 +68,6 @@ struct msdc_hw {
 	/* external power control for card */
 	void (*ext_power_on)(void);
 	void (*ext_power_off)(void);
-
-	/* external sdio irq operations */
-	void (*enable_sdio_eirq)(void);
-	void (*disable_sdio_eirq)(void);
 };
 
 extern struct msdc_hw msdc0_hw;
diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 226ffb2589a9..eaf2e56abb29 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -2261,10 +2261,6 @@ static void msdc_ops_enable_sdio_irq(struct mmc_host *mmc, int enable)
 	u32 tmp;
 
 	if (hw->flags & MSDC_EXT_SDIO_IRQ) { /* yes for sdio */
-		if (enable)
-			hw->enable_sdio_eirq();  /* combo_sdio_enable_eirq */
-		else
-			hw->disable_sdio_eirq(); /* combo_sdio_disable_eirq */
 	} else {
 		ERR_MSG("XXX ");  /* so never enter here */
 		tmp = sdr_read32(SDC_CFG);
-- 
2.16.1

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel




[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux