lkml.org 
[lkml]   [2014]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 120/120] mmc: sdhci-pci: Fix possibility of chip->fixes being null
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Adrian Hunter <adrian.hunter@intel.com>

    commit 945be38caa287b177b8c17ffaae7754cab6a658f upstream.

    It is possible for chip->fixes to be null. Check before dereferencing it.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Chris Ball <chris@printf.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci-pci.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/mmc/host/sdhci-pci.c
    +++ b/drivers/mmc/host/sdhci-pci.c
    @@ -1466,7 +1466,8 @@ static struct sdhci_pci_slot *sdhci_pci_
    * from runtime suspend. If it is not there, don't allow runtime PM.
    * Note sdhci_pci_add_own_cd() sets slot->cd_gpio to -EINVAL on failure.
    */
    - if (chip->fixes->own_cd_for_runtime_pm && !gpio_is_valid(slot->cd_gpio))
    + if (chip->fixes && chip->fixes->own_cd_for_runtime_pm &&
    + !gpio_is_valid(slot->cd_gpio))
    chip->allow_runtime_pm = false;

    return slot;



    \
     
     \ /
      Last update: 2014-02-11 22:41    [W:4.058 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site