Skip to content

Commit

Permalink
media: amphion: Fix error handling in vpu_driver_init()
Browse files Browse the repository at this point in the history
[ Upstream commit a95cc6d ]

A problem about modprobe amphion-vpu failed is triggered with the
following log given:

 [ 2208.634841] Error: Driver 'amphion-vpu' is already registered, aborting...
 modprobe: ERROR: could not insert 'amphion_vpu': Device or resource busy

The reason is that vpu_driver_init() returns vpu_core_driver_init()
directly without checking its return value, if vpu_core_driver_init()
failed, it returns without unregister amphion_vpu_driver, resulting the
amphion-vpu can never be installed later.
A simple call graph is shown as below:

 vpu_driver_init()
   platform_driver_register() # register amphion_vpu_driver
   vpu_core_driver_init()
     platform_driver_register()
       driver_register()
         bus_add_driver()
           dev = kzalloc(...) # OOM happened
   # return without unregister amphion_vpu_driver

Fix by unregister amphion_vpu_driver when vpu_core_driver_init() returns
error.

Fixes: b50a64f ("media: amphion: add amphion vpu device driver")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Reviewed-by: ming_qian <ming.qian@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yuan Can authored and gregkh committed Dec 31, 2022
1 parent abc73b6 commit d72bff7
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/media/platform/amphion/vpu_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,11 @@ static int __init vpu_driver_init(void)
if (ret)
return ret;

return vpu_core_driver_init();
ret = vpu_core_driver_init();
if (ret)
platform_driver_unregister(&amphion_vpu_driver);

return ret;
}

static void __exit vpu_driver_exit(void)
Expand Down

0 comments on commit d72bff7

Please sign in to comment.