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

Commit 5ef1caeb authored by Ram Prakash Gupta's avatar Ram Prakash Gupta
Browse files

mmc: cqhci: Fix NULL pointer dereference crash 



Add a check on cmdq_host->ops to avoid NULL pointer
dereference, if sdhci_dumpregs is called before
initializing cmdq_host->ops structure.

Change-Id: Ia30cd6c008a624c6cac3b79658c647125f557b04
Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
Signed-off-by: default avatarRam Prakash Gupta <rampraka@codeaurora.org>
parent 91ce446b

drivers/mmc/host/cqhci.h

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct cqhci_host_ops { 


static inline void cqhci_writel(struct cqhci_host *host, u32 val, int reg)

{

	if (unlikely(host->ops->write_l))

	if (unlikely(host->ops && host->ops->write_l))

		host->ops->write_l(host, val, reg);

	else

		writel_relaxed(val, host->mmio + reg);
@@ -248,7 +248,7 @@ static inline void cqhci_writel(struct cqhci_host *host, u32 val, int reg) 


static inline u32 cqhci_readl(struct cqhci_host *host, int reg)

{

	if (unlikely(host->ops->read_l))

	if (unlikely(host->ops && host->ops->read_l))

		return host->ops->read_l(host, reg);

	else

		return readl_relaxed(host->mmio + reg);