Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 709edecd authored by Wei Yongjun's avatar Wei Yongjun Committed by Samuel Ortiz
Browse files

mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask() 



The dereference to 'mfd' should be moved below the NULL test.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 3748f193

drivers/mfd/sta2x11-mfd.c

+3 −1
Original line number Diff line number Diff line
@@ -116,12 +116,14 @@ u32 __sta2x11_mfd_mask(struct pci_dev *pdev, u32 reg, u32 mask, u32 val, 
	struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);

	u32 r;

	unsigned long flags;

	void __iomem *regs = mfd->regs[index];

	void __iomem *regs;



	if (!mfd) {

		dev_warn(&pdev->dev, ": can't access sctl regs\n");

		return 0;

	}



	regs = mfd->regs[index];

	if (!regs) {

		dev_warn(&pdev->dev, ": system ctl not initialized\n");

		return 0;