You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From c42ae04bb6ed5be61d3b3e2e2c6004ae252ee34a Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Fri, 8 Mar 2019 11:26:00 +0000
|
|
Subject: [PATCH] staging: bcm2835_codec: Clean up logging on unloading
|
|
the driver
|
|
|
|
The log line was missing a closing \n, so wasn't added to the
|
|
log immediately.
|
|
Adds the function of the V4L2 device that is being unregistered
|
|
too.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
.../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
@@ -77,6 +77,12 @@ enum bcm2835_codec_role {
|
|
ISP,
|
|
};
|
|
|
|
+const static char *roles[] = {
|
|
+ "decode",
|
|
+ "encode",
|
|
+ "isp"
|
|
+};
|
|
+
|
|
static const char * const components[] = {
|
|
"ril.video_decode",
|
|
"ril.video_encode",
|
|
@@ -2522,7 +2528,6 @@ static int bcm2835_codec_create(struct p
|
|
struct video_device *vfd;
|
|
int video_nr;
|
|
int ret;
|
|
- const static char *roles[] = {"decode", "encode", "isp"};
|
|
|
|
dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
|
|
if (!dev)
|
|
@@ -2615,7 +2620,8 @@ static int bcm2835_codec_destroy(struct
|
|
if (!dev)
|
|
return -ENODEV;
|
|
|
|
- v4l2_info(&dev->v4l2_dev, "Removing " MEM2MEM_NAME);
|
|
+ v4l2_info(&dev->v4l2_dev, "Removing " MEM2MEM_NAME ", %s\n",
|
|
+ roles[dev->role]);
|
|
v4l2_m2m_release(dev->m2m_dev);
|
|
video_unregister_device(&dev->vfd);
|
|
v4l2_device_unregister(&dev->v4l2_dev);
|