Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031344AbbD2AtZ (ORCPT ); Tue, 28 Apr 2015 20:49:25 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:34585 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031157AbbD2AtW (ORCPT ); Tue, 28 Apr 2015 20:49:22 -0400 MIME-Version: 1.0 In-Reply-To: <1429125053-31825-1-git-send-email-bjorn.andersson@sonymobile.com> References: <1429125053-31825-1-git-send-email-bjorn.andersson@sonymobile.com> Date: Wed, 29 Apr 2015 09:49:20 +0900 Message-ID: Subject: Re: [PATCH] ufs: Reinstate NULL pointer checks for regulators From: Akinobu Mita To: Bjorn Andersson Cc: Vinayak Holikatti , "James E.J. Bottomley" , Mark Brown , "linux-scsi@vger.kernel.org" , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2195 Lines: 64 2015-04-16 4:10 GMT+09:00 Bjorn Andersson : > The cleanup during the introduction of regulator_set_load() was a too > optimistic and re-opened an issue with vreg being dereferenced while > being NULL. > > So reinstate the NULL checks and add back the BUG_ON() to follow the > general coding convention of the implementation. > > Fixes: 7b16a07c3293 ("ufs: Rename of regulator_set_optimum_mode") > Reported-by: Akinobu Mita > Signed-off-by: Bjorn Andersson Tested-by: Akinobu Mita This patch still isn't picked up by scsi tree nor regulator tree. James, Mark, Could you consider taking care of this patch? > --- > drivers/scsi/ufs/ufshcd.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 648a44675880..540e00df6de1 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -4262,8 +4262,7 @@ static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg, > { > int ret; > > - if (!vreg) > - return 0; > + BUG_ON(!vreg); > > ret = regulator_set_load(vreg->reg, ua); > if (ret < 0) { > @@ -4277,12 +4276,18 @@ static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg, > static inline int ufshcd_config_vreg_lpm(struct ufs_hba *hba, > struct ufs_vreg *vreg) > { > + if (!vreg) > + return 0; > + > return ufshcd_config_vreg_load(hba->dev, vreg, UFS_VREG_LPM_LOAD_UA); > } > > static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba, > struct ufs_vreg *vreg) > { > + if (!vreg) > + return 0; > + > return ufshcd_config_vreg_load(hba->dev, vreg, vreg->max_uA); > } > > -- > 1.8.2.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/