From: Doug Anderson Date: Wed, 11 Mar 2015 22:15:14 +0000 (-0700) Subject: mmc: dw_mmc: Don't try to enable the CD until we're sure we're not deferring X-Git-Tag: omap-for-v4.1/fixes-rc1~178^2~21 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b793f658b194edfe5e1d86aaeace01a7b03c68f9;p=pandora-kernel.git mmc: dw_mmc: Don't try to enable the CD until we're sure we're not deferring If dw_mci_init_slot() returns that we got a probe deferral then it may leave slot->mmc as NULL. That will cause dw_mci_enable_cd() to crash when it calls mmc_gpio_get_cd(). Fix this by moving the call of dw_mci_enable_cd() until we're sure that we're good. Note that if we have more than one slot and one defers (but the others don't) things won't work so well. ...but that's not a new thing and everyone has already agreed that multislot support ought to be removed from dw_mmc eventually anyway since it is unused, untested, and you can see several bugs like this by inspecting the code. Fixes: bcafaf5470f0 ("mmc: dw_mmc: Only enable CD after setup and only if needed") Signed-off-by: Doug Anderson Signed-off-by: Jaehoon Chung Signed-off-by: Ulf Hansson --- Reading git-diff-tree failed