sst: fix compile error
PATCH 1/1 sst: fix compile error
Add several include files to fix the below compile error.
drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function) drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears in
--- drivers/staging/intel_sst/intelmid.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/staging/intel_sst/intelmid.c +3 -0
@@ -37,8 +37,11 @@#include <sound/pcm_params.h> #include <sound/initval.h> #include <linux/gpio.h> +#include <linux/firmware.h> #include "intel_sst.h" #include "intel_sst_ioctl.h" +#include "intel_sst_fw_ipc.h" +#include "intel_sst_common.h" #include "intelmid_snd_control.h" #include "intelmid_adc_control.h" #include "intelmid.h"
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 7 lines · Lu Guanqun
Add several include files to fix the below compile error.
drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears inSigned-off-by Lu Guanqun <[email protected]>
Is this needed in 2.6.39? Greg, I'm happy to take this through ASoC if you're OK with that.
Quoted 11 lines
--- drivers/staging/intel_sst/intelmid.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)drivers/staging/intel_sst/intelmid.c +0
-0@@ -37,8 +37,11 @@#include <sound/pcm_params.h>
drivers/staging/intel_sst/intelmid.c line 47
Quoted 10 lines
drivers/staging/intel_sst/intelmid.c +3
-0#include <sound/initval.h> #include <linux/gpio.h> +#include <linux/firmware.h> #include "intel_sst.h" #include "intel_sst_ioctl.h" +#include "intel_sst_fw_ipc.h" +#include "intel_sst_common.h" #include "intelmid_snd_control.h" #include "intelmid_adc_control.h" #include "intelmid.h"
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 11 lines · Mark Brown
Quoted 7 lines · Lu Guanqun
Add several include files to fix the below compile error.
drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears inSigned-off-by Lu Guanqun <[email protected]>Is this needed in 2.6.39? Greg, I'm happy to take this through ASoC if you're OK with that.
Hi Mark,
This isn't needed for 2.6.39.
This compile error is actually caused by my fault, see below commit.
commit 0ed625b2f2751c249417bd28694e37ef48eb5fbb
Author: Lu Guanqun <[email protected]> Date: Wed Apr 6 10:20:42 2011 +0800
sst: make register_sst_card more self-contained
register_sst_card is used in ASoC code with field scard_ops being NULL. Without this patch, there will be NULL dereference.
And this commit is only in your branch for-2.6.40. I failed to add CONFIG_INTELMID=y in my previous test, so this error is hidden.
Quoted 22 lines
Quoted 22 lines
--- drivers/staging/intel_sst/intelmid.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)drivers/staging/intel_sst/intelmid.c +3
-0@@ -37,8 +37,11 @@#include <sound/pcm_params.h> #include <sound/initval.h> #include <linux/gpio.h> +#include <linux/firmware.h> #include "intel_sst.h" #include "intel_sst_ioctl.h" +#include "intel_sst_fw_ipc.h" +#include "intel_sst_common.h" #include "intelmid_snd_control.h" #include "intelmid_adc_control.h" #include "intelmid.h"
Signature · 5 lines
guanqun _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 1 line · Lu Guanqun
This compile error is actually caused by my fault, see below commit.
Ah, OK, it's a change I've applied in my tree that introduces the issue
- I'll apply your fix next time I run through patches.
Quoted 6 lines · Mark Brown
Quoted 1 line · Lu Guanqun
This compile error is actually caused by my fault, see below commit.
Ah, OK, it's a change I've applied in my tree that introduces the issue
- I'll apply your fix next time I run through patches.
Thanks. Later when I'm sending patches, I'll try to clarify which kernel tree I'm based on...
Signature · 1 line
guanqun
Quoted 5 lines · Lu Guanqun
Add several include files to fix the below compile error.
drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears in
This does not apply against my for-2.6.40 branch - please check which tree it should be applied against.
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 9 lines · Mark Brown
Quoted 5 lines · Lu Guanqun
Add several include files to fix the below compile error.
drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears inThis does not apply against my for-2.6.40 branch - please check which tree it should be applied against.
Hi Mark,
I've resent the patch based on your 2.6.40 branch. Please check. It can be applied cleanly. The reason is I mixes several kernel trees together and the other has changes in this intelmid.c file.
Sorry for the trouble.
Signature · 5 lines
guanqun _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel