summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVamshi Gajjela <vamshigajjela@google.com>2024-05-07 14:07:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-07-05 09:12:43 +0200
commit6337072467296defa7d1b0160c03de3d39b1d318 (patch)
treec924e4ddf22c3d52ede205445a92d5ef49a6e3e6 /drivers
parent90551062fd6978c7bc9c9d363b6cea4c9cf2129d (diff)
spmi: hisi-spmi-controller: Do not override device identifier
[ Upstream commit eda4923d78d634482227c0b189d9b7ca18824146 ] 'nr' member of struct spmi_controller, which serves as an identifier for the controller/bus. This value is a dynamic ID assigned in spmi_controller_alloc, and overriding it from the driver results in an ida_free error "ida_free called for id=xx which is not allocated". Signed-off-by: Vamshi Gajjela <vamshigajjela@google.com> Fixes: 70f59c90c819 ("staging: spmi: add Hikey 970 SPMI controller driver") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240228185116.1269-1-vamshigajjela@google.com Signed-off-by: Stephen Boyd <sboyd@kernel.org> Link: https://lore.kernel.org/r/20240507210809.3479953-5-sboyd@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/hikey9xx/hisi-spmi-controller.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c
index 29f226503668..eee3dcf96ee7 100644
--- a/drivers/staging/hikey9xx/hisi-spmi-controller.c
+++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c
@@ -303,7 +303,6 @@ static int spmi_controller_probe(struct platform_device *pdev)
spin_lock_init(&spmi_controller->lock);
- ctrl->nr = spmi_controller->channel;
ctrl->dev.parent = pdev->dev.parent;
ctrl->dev.of_node = of_node_get(pdev->dev.of_node);