diff mbox series

[4.4,132/188] power: supply: ab8500: Fix an old bug

Message ID	20210719144940.808576241@linuxfoundation.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Krzysztof Kozlowski <krzk@kernel.org>, Marcus Cooper <codekipper@gmail.com>, Linus Walleij <linus.walleij@linaro.org>, Sebastian Reichel <sebastian.reichel@collabora.com> Subject: [PATCH 4.4 132/188] power: supply: ab8500: Fix an old bug Date: Mon, 19 Jul 2021 16:51:56 +0200 Message-Id: <20210719144940.808576241@linuxfoundation.org> In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.4,002/188] media: dvb-usb: fix wrong definition [4.4,005/188] usb: gadget: eem: fix echo command packet response issue [4.4,007/188] ntfs: fix validity check for file name attribute [4.4,008/188,xarray] iov_iter_fault_in_readable() should do nothing in xarray case [4.4,010/188] ARM: dts: at91: sama5d4: fix pinctrl muxing [4.4,013/188] ext4: correct the cache_nr in tracepoint ext4_es_shrink_exit [4.4,014/188] ext4: remove check for zero nr_to_scan in ext4_es_scan() [4.4,016/188] SUNRPC: Fix the batch tasks count wraparound. [4.4,017/188] SUNRPC: Should wake up the privileged task firstly. [4.4,022/188] serial_cs: Add Option International GSM-Ready 56K/ISDN modem [4.4,024/188] ssb: sdio: Dont overwrite const buffer if block_write fails [4.4,025/188] seq_buf: Make trace_seq_putmem_hex() support data longer than 8 [4.4,026/188] fuse: check connected before queueing on fpq->io [4.4,029/188] crypto: nx - add missing MODULE_DEVICE_TABLE [4.4,030/188] media: cpia2: fix memory leak in cpia2_usb_probe [4.4,032/188] crypto: qat - check return code of qat_hal_rd_rel_reg() [4.4,033/188] crypto: qat - remove unused macro in FW loader [4.4,038/188] media: dvb_net: avoid speculation from net slot [4.4,041/188] ACPI: processor idle: Fix up C-state latency if not ordered [4.4,043/188] fs: dlm: cancel work sync othercon [4.4,045/188] ACPI: bus: Call kobject_put() in acpi_init() error path [4.4,047/188] ia64: mca_drv: fix incorrect array size calculation [4.4,048/188] crypto: ixp4xx - dma_unmap the correct address [4.4,049/188] crypto: ux500 - Fix error return code in hash_hw_final() [4.4,050/188] sata_highbank: fix deferred probing [4.4,052/188] media: I2C: change RST to "RSET" to fix multiple build errors [4.4,053/188] pata_octeon_cf: avoid WARN_ON() in ata_host_activate() [4.4,055/188] media: tc358743: Fix error return code in tc358743_probe_of() [4.4,056/188] media: siano: Fix out-of-bounds warnings in smscore_load_firmware_family2() [4.4,057/188] mmc: usdhi6rol0: fix error return code in usdhi6_probe() [4.4,060/188] crypto: nx - Fix RCU warning in nx842_OF_upd_status [4.4,062/188] net: pch_gbe: Propagate error from devm_gpio_request_one() [4.4,063/188] ehea: fix error return code in ehea_restart_qps() [4.4,064/188] drm: qxl: ensure surf.data is ininitialized [4.4,066/188] brcmsmac: mac80211_if: Fix a resource leak in an error handling path [4.4,070/188] net: ethernet: aeroflex: fix UAF in greth_of_remove [4.4,071/188] net: ethernet: ezchip: fix UAF in nps_enet_remove [4.4,072/188] net: ethernet: ezchip: fix error handling [4.4,073/188] vxlan: add missing rcu_read_lock() in neigh_reduce() [4.4,075/188] writeback: fix obtain a reference to a freeing memcg css [4.4,077/188] iio: adis_buffer: do not return ints in irq handlers [4.4,078/188] iio: accel: bma180: Fix buffer alignment in iio_push_to_buffers_with_timestamp() [4.4,079/188] iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp() [4.4,080/188] iio: accel: stk8ba50: Fix buffer alignment in iio_push_to_buffers_with_timestamp() [4.4,081/188] Input: hil_kbd - fix error return code in hil_dev_connect() [4.4,082/188] char: pcmcia: error out if num_bytes_read is greater than 4 in set_protocol() [4.4,083/188] tty: nozomi: Fix the error handling path of nozomi_card_init() [4.4,085/188] s390: appldata depends on PROC_SYSCTL [4.4,086/188] staging: gdm724x: check for buffer overflow in gdm_lte_multi_sdu_pkt() [4.4,087/188] staging: gdm724x: check for overflow in gdm_lte_netif_rx() [4.4,088/188] scsi: mpt3sas: Fix error return value in _scsih_expander_add() [4.4,091/188] extcon: max8997: Add missing modalias string [4.4,093/188] scsi: core: Retry I/O for Notify (Enable Spinup) Required error [4.4,094/188] net: pch_gbe: Use proper accessors to BE data in pch_ptp_match() [4.4,095/188] hugetlb: clear huge pte during flush function on mips platform [4.4,097/188] mISDN: fix possible use-after-free in HFC_cleanup() [4.4,099/188] net: Treat __napi_schedule_irqoff() as __napi_schedule() on PREEMPT_RT [4.4,101/188] drm/virtio: Fix double free on probe failure [4.4,103/188] e100: handle eeprom as little endian [4.4,105/188] RDMA/cxgb4: Fix missing error code in create_qp() [4.4,107/188] net: micrel: check return value after calling platform_get_resource() [4.4,114/188] atm: nicstar: register the interrupt handler in the right place [4.4,116/188] sfc: error code if SRIOV cannot be disabled [4.4,118/188] RDMA/cma: Fix rdma_resolve_route() memory leak [4.4,121/188] Bluetooth: btusb: fix bt fiwmare downloading failure issue for qca btsoc. [4.4,123/188] fuse: reject internal errno [4.4,124/188] can: gw: synchronize rcu operations before removing gw job entry [4.4,125/188] can: bcm: delay release of struct bcm_op after synchronize_rcu() [4.4,129/188] ata: ahci_sunxi: Disable DIPM [4.4,131/188] ipmi/watchdog: Stop watchdog timer when the current action is none [4.4,132/188] power: supply: ab8500: Fix an old bug [4.4,133/188] seq_buf: Fix overflow in seq_buf_putmem_hex() [4.4,136/188] media: zr364xx: fix memory leak in zr364xx_start_readpipe [4.4,138/188] media: gspca/sunplus: fix zero-length control requests [4.4,140/188] jfs: fix GPF in diFree [4.4,141/188] KVM: x86: Use guest MAXPHYADDR from CPUID.0x8000_0008 iff TDP is enabled [4.4,143/188] tty: serial: fsl_lpuart: fix the potential risk of division or modulo by zero [4.4,145/188] Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro" [4.4,146/188] scsi: lpfc: Fix "Unexpected timeout" error in direct attach topology [4.4,147/188] tty: serial: 8250: serial_cs: Fix a memory leak in error handling path [4.4,149/188] scsi: iscsi: Add iscsi_cls_conn refcount helpers [4.4,150/188] mfd: da9052/stmpe: Add and modify MODULE_DEVICE_TABLE [4.4,151/188] ALSA: sb: Fix potential double-free of CSP mixer elements [4.4,153/188] gpio: zynq: Check return value of pm_runtime_get_sync [4.4,156/188] ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() [4.4,158/188] usb: gadget: f_hid: fix endianness issue with descriptors [4.4,159/188] usb: gadget: hid: fix error return code in hid_bind() [4.4,160/188] powerpc/boot: Fixup device-tree on little endian [4.4,163/188] lib/decompress_unlz4.c: correctly handle zero-padding around initrds. [4.4,164/188] pwm: spear: Dont modify HW state in .remove callback [4.4,165/188] power: supply: ab8500: Avoid NULL pointers [4.4,166/188] power: reset: gpio-poweroff: add missing MODULE_DEVICE_TABLE [4.4,167/188] ARM: 9087/1: kprobes: test-thumb: fix for LLVM_IAS=1 [4.4,168/188] watchdog: Fix possible use-after-free in wdt_startup() [4.4,170/188] watchdog: Fix possible use-after-free by calling del_timer_sync() [4.4,171/188] ceph: remove bogus checks and WARN_ONs from ceph_set_page_dirty [4.4,174/188] virtio-blk: Fix memory leak among suspend/resume procedure [4.4,177/188] um: fix error return code in slip_open() [4.4,178/188] um: fix error return code in winch_tramp() [4.4,180/188] ALSA: isa: Fix error return code in snd_cmi8330_probe() [4.4,183/188] rtc: fix snprintf() checking in is_rtc_hctosys() [4.4,185/188] memory: fsl_ifc: fix leak of private memory on probe failure [4.4,187/188] mips: disable branch profiling in boot/decompress.o

Commit Message

Greg Kroah-Hartman July 19, 2021, 2:51 p.m. UTC

From: Linus Walleij <linus.walleij@linaro.org>


commit f1c74a6c07e76fcb31a4bcc1f437c4361a2674ce upstream.

Trying to get the AB8500 charging driver working I ran into a bit
of bitrot: we haven't used the driver for a while so errors in
refactorings won't be noticed.

This one is pretty self evident: use argument to the macro or we
end up with a random pointer to something else.

Cc: stable@vger.kernel.org
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Marcus Cooper <codekipper@gmail.com>
Fixes: 297d716f6260 ("power_supply: Change ownership from driver to core")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 include/linux/mfd/abx500/ux500_chargalg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/include/linux/mfd/abx500/ux500_chargalg.h
+++ b/include/linux/mfd/abx500/ux500_chargalg.h
@@ -15,7 +15,7 @@ 
  * - POWER_SUPPLY_TYPE_USB,
  * because only them store as drv_data pointer to struct ux500_charger.
  */
-#define psy_to_ux500_charger(x) power_supply_get_drvdata(psy)
+#define psy_to_ux500_charger(x) power_supply_get_drvdata(x)
 
 /* Forward declaration */
 struct ux500_charger;