mirror of
https://github.com/torvalds/linux.git
synced 2026-10-23 23:51:02 +02:00
[GIT PULL for v7.3-rc7] media fixes
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAmrJCqQACgkQCF8+vY7k 4RWu/w/+LBwsMO9VA1C16lAKROP5HwuSdumeNnsjNinZX4Tonmz7Y5L+Ru+9Jzcz WDpbNtJTNhMa2f+i1YhCPVxNp22mwuGaqNUm8xfipt9fuvwShPaTTzoNsEh7l3iT TwMt2G5Np0G1u0fiDaBESR30sKw6YfYR8nxhM3lP4FfK4M3GhkuDnaAtwzCHa1Dm 1M1J76kS6eUGT+BOJMy6qARhAD00zQgjk9HZDV56FmCsz2XdDh1hnOC11IvbRV+K spdU3TffnoU4FMWQQnqJHxJR/Btq72O0CmiHVPopHQFM9DA6eEBd0eUcXTieIjbb aFp04/z0EWlYuwEGPKvnAdmwiJfRgoMLgGTnyViZMV0KtGbXVHmEr4KhUjRNMvVl Vjz/9ehYEweiKwQhUuV+upaQeWyQzI9VNbkAr9KSXX81piyFAkzur4dXljf8qR/x KQUIyhyshcvgQ0upoVFZ2q23hq1s7hKGOmFKT6DZhXs0OySkYRbj/iFzQ4YyhBpJ qTMmFF+Edlg0CtVhST3QxZcYv7b97RG2pue+R2jX71xB25yq2MbebMmjKB8Vp5id AhsvlRY0Dyp1sPqPtfukERSoCgJ6UHKI6D7DqpqzUcIeLgVyBEAjri4jUCZxhvXn 9fzYX56K1IuEFUl64LrPAhejo0iQTsdKx/gBprQulzwsDp4QrX8= =M/y8 -----END PGP SIGNATURE----- Merge tag 'media/v7.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media Pull media fix from Mauro Carvalho Chehab: "A fix for em28xx unregister code affecting devices with FM radio support" * tag 'media/v7.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: em28xx: use video_unregister_device for radio_dev
This commit is contained in:
commit
f7bec60381
|
|
@ -2416,7 +2416,7 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
|
|||
if (video_is_registered(&v4l2->radio_dev)) {
|
||||
dev_info(&dev->intf->dev, "V4L2 device %s deregistered\n",
|
||||
video_device_node_name(&v4l2->radio_dev));
|
||||
vb2_video_unregister_device(&v4l2->radio_dev);
|
||||
video_unregister_device(&v4l2->radio_dev);
|
||||
}
|
||||
if (video_is_registered(&v4l2->vbi_dev)) {
|
||||
dev_info(&dev->intf->dev, "V4L2 device %s deregistered\n",
|
||||
|
|
@ -3082,7 +3082,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
|
|||
dev_info(&dev->intf->dev,
|
||||
"V4L2 device %s deregistered\n",
|
||||
video_device_node_name(&v4l2->radio_dev));
|
||||
vb2_video_unregister_device(&v4l2->radio_dev);
|
||||
video_unregister_device(&v4l2->radio_dev);
|
||||
}
|
||||
if (video_is_registered(&v4l2->vbi_dev)) {
|
||||
dev_info(&dev->intf->dev,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user