2013-03-08 10:22:27

by Lad, Prabhakar

Subject: [PATCH] davinci: vpbe: fix module build

From: Lad, Prabhakar <[email protected]>

add a null entry in platform_device_id {}.

This patch fixes following error:
drivers/media/platform/davinci/vpbe_venc: struct platform_device_id is 24 bytes. The last of 3 is:
0x64 0x6d 0x33 0x35 0x35 0x2c 0x76 0x70 0x62 0x65 0x2d 0x76 0x65 0x6e 0x63 0x00 0x00 0x00 0x00 0x00 0x03 0x00 0x00 0x00
FATAL: drivers/media/platform/davinci/vpbe_venc: struct platform_device_id is not terminated with a NULL entry!
make[1]: *** [__modpost] Error 1

Reported-by: Sekhar Nori <[email protected]>
Signed-off-by: Lad, Prabhakar <[email protected]>
---
drivers/media/platform/davinci/vpbe_osd.c | 3 +++
drivers/media/platform/davinci/vpbe_venc.c | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c
index 12ad17c..396a51c 100644
--- a/drivers/media/platform/davinci/vpbe_osd.c
+++ b/drivers/media/platform/davinci/vpbe_osd.c
@@ -52,6 +52,9 @@ static struct platform_device_id vpbe_osd_devtype[] = {
.name = DM355_VPBE_OSD_SUBDEV_NAME,
.driver_data = VPBE_VERSION_3,
},
+ {
+ /* sentinel */
+ }
};

MODULE_DEVICE_TABLE(platform, vpbe_osd_devtype);
diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c
index bdbebd5..34c704b 100644
--- a/drivers/media/platform/davinci/vpbe_venc.c
+++ b/drivers/media/platform/davinci/vpbe_venc.c
@@ -51,6 +51,9 @@ static struct platform_device_id vpbe_venc_devtype[] = {
.name = DM355_VPBE_VENC_SUBDEV_NAME,
.driver_data = VPBE_VERSION_3,
},
+ {
+ /* sentinel */
+ }
};

MODULE_DEVICE_TABLE(platform, vpbe_venc_devtype);
--
1.7.4.1

2013-03-08 11:18:09

by Sekhar Nori

Subject: Re: [PATCH] davinci: vpbe: fix module build

On 3/8/2013 3:52 PM, Prabhakar lad wrote:
> From: Lad, Prabhakar <[email protected]>
>
> add a null entry in platform_device_id {}.
>
> This patch fixes following error:
> drivers/media/platform/davinci/vpbe_venc: struct platform_device_id is 24 bytes. The last of 3 is:
> 0x64 0x6d 0x33 0x35 0x35 0x2c 0x76 0x70 0x62 0x65 0x2d 0x76 0x65 0x6e 0x63 0x00 0x00 0x00 0x00 0x00 0x03 0x00 0x00 0x00
> FATAL: drivers/media/platform/davinci/vpbe_venc: struct platform_device_id is not terminated with a NULL entry!
> make[1]: *** [__modpost] Error 1
>
> Reported-by: Sekhar Nori <[email protected]>
> Signed-off-by: Lad, Prabhakar <[email protected]>

This fixed the issue for me. Thanks!

Tested-by: Sekhar Nori <[email protected]>

~Sekhar