Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1732439

[PATCH for 4.9 15/59] power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on error

Show all headers | View raw

From: Hans de Goede <hdegoede@redhat.com>

[ Upstream commit 6f074bc878dc9b00c0df0bf3a8cb1d9e294cd881 ]

If reading the register fails, return the actual error code, instead
of the uninitialized val variable;

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 drivers/power/supply/axp288_fuel_gauge.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
index 5bdde692f724..f62f9dfea984 100644
--- a/drivers/power/supply/axp288_fuel_gauge.c
+++ b/drivers/power/supply/axp288_fuel_gauge.c
@@ -169,8 +169,10 @@ static int fuel_gauge_reg_readb(struct axp288_fg_info *info, int reg)
 			break;
 	}
 
-	if (ret < 0)
+	if (ret < 0) {
 		dev_err(&info->pdev->dev, "axp288 reg read err:%d\n", ret);
+		return ret;
+	}
 
 	return val;
 }
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH for 4.9 01/59] drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 12/59] MIPS: kexec: Do not reserve invalid crashkernel  memory on boot "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 20/59] reset: ti_syscon: fix a ti_syscon_reset_status  issue "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 04/59] drm/i915: Fix the overlay frontbuffer tracking "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 24/59] usb: make the MTK XHCI driver compile for older  MIPS SoCs "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 18/59] igb: re-assign hw address pointer on reset  after PCI error "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 19/59] extcon: axp288: Use vbus-valid instead of  -present to determine cable presence "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 15/59] power: supply: axp288_fuel_gauge: Fix  fuel_gauge_reg_readb return on error "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 11/59] MIPS: fix mem=X@Y commandline processing "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
    Re: [PATCH for 4.9 11/59] MIPS: fix mem=X@Y commandline processing Mathieu Malaterre <malat@debian.org> - 2017-09-14 21:00 +0200
      Re: [PATCH for 4.9 11/59] MIPS: fix mem=X@Y commandline processing "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 21:20 +0200
        Re: [PATCH for 4.9 11/59] MIPS: fix mem=X@Y commandline processing Mathieu Malaterre <malat@debian.org> - 2017-09-14 21:20 +0200
          Re: [PATCH for 4.9 11/59] MIPS: fix mem=X@Y commandline processing Marcin Nowakowski <marcin.nowakowski@imgtec.com> - 2017-09-15 07:50 +0200
            Re: [PATCH for 4.9 11/59] MIPS: fix mem=X@Y commandline processing Paul Burton <paul.burton@imgtec.com> - 2017-09-15 19:10 +0200
  [PATCH for 4.9 08/59] RDS: RDMA: Fix the composite message user  notification "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 23/59] clk: wm831x: fix usleep_range with bad range "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 16/59] scsi: be2iscsi: Add checks to validate CID  alloc/free "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 22/59] clk/axs10x: Clear init field in driver probe "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 17/59] ARM: dts: am335x-chilisom: Wakeup from RTC-only  state by power on event "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200
  [PATCH for 4.9 21/59] sh_eth: use correct name for ECMR_MPDE bit "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-14 18:30 +0200

csiph-web