Merge tag 'staging-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
"Here are two small memory leak fixes for the vchiq_arm staging driver
that have been sitting in my tree for weeks and should get merged for
6.12-rc7 so that people don't keep tripping over them.

They both have been in linux-next for a while with no reported
problems"

* tag 'staging-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: vchiq_arm: Use devm_kzalloc() for drv_mgmt allocation
staging: vchiq_arm: Use devm_kzalloc() for vchiq_arm_state allocation

+2 -4
+2 -4
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
··· 593 593 { 594 594 struct vchiq_arm_state *platform_state; 595 595 596 - platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL); 596 + platform_state = devm_kzalloc(state->dev, sizeof(*platform_state), GFP_KERNEL); 597 597 if (!platform_state) 598 598 return -ENOMEM; 599 599 ··· 1731 1731 return -ENOENT; 1732 1732 } 1733 1733 1734 - mgmt = kzalloc(sizeof(*mgmt), GFP_KERNEL); 1734 + mgmt = devm_kzalloc(&pdev->dev, sizeof(*mgmt), GFP_KERNEL); 1735 1735 if (!mgmt) 1736 1736 return -ENOMEM; 1737 1737 ··· 1789 1789 1790 1790 arm_state = vchiq_platform_get_arm_state(&mgmt->state); 1791 1791 kthread_stop(arm_state->ka_thread); 1792 - 1793 - kfree(mgmt); 1794 1792 } 1795 1793 1796 1794 static struct platform_driver vchiq_driver = {