redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: mt7621-mmc: Fix null pointer deref if ext sdio irq enabled

Browse source 
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@lkamp.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Lütke-Stetzkamp 2018-04-18 17:27:24 +02:00 committed by Greg Kroah-Hartman
parent e254adf415
commit c65f33aaaa
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/mt7621-mmc/board.h
View file

@ -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;

4
drivers/staging/mt7621-mmc/sd.c
View file

@ -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);