diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-20 09:13:44 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-20 09:13:44 -0200 |
| commit | 9b771c780d9f19ae15d1e0bd15b6a83c4b8d3f49 (patch) | |
| tree | f78c454775b4d21134be65479017449c29b2d4ca | |
| parent | 9a3cca9ddec155f7c751f0e0dbc2facb344f66d9 (diff) | |
| parent | e07e5abc1bfe38913c72ca97cce4d7b7b034cd1d (diff) | |
| download | mediapointer-dvb-s2-9b771c780d9f19ae15d1e0bd15b6a83c4b8d3f49.tar.gz mediapointer-dvb-s2-9b771c780d9f19ae15d1e0bd15b6a83c4b8d3f49.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda18271
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/dvb/frontends/or51132.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/or51211.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-audio.c | 2 | ||||
| -rw-r--r-- | v4l/compat.h | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/linux/drivers/media/dvb/frontends/or51132.c b/linux/drivers/media/dvb/frontends/or51132.c index b314a1f2d..1d2d28ce8 100644 --- a/linux/drivers/media/dvb/frontends/or51132.c +++ b/linux/drivers/media/dvb/frontends/or51132.c @@ -564,7 +564,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config, /* Allocate memory for the internal state */ state = kmalloc(sizeof(struct or51132_state), GFP_KERNEL); if (state == NULL) - goto error; + return NULL; /* Setup the state */ state->config = config; @@ -576,10 +576,6 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config, memcpy(&state->frontend.ops, &or51132_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; - -error: - kfree(state); - return NULL; } static struct dvb_frontend_ops or51132_ops = { diff --git a/linux/drivers/media/dvb/frontends/or51211.c b/linux/drivers/media/dvb/frontends/or51211.c index f02bd9445..6a6b0d727 100644 --- a/linux/drivers/media/dvb/frontends/or51211.c +++ b/linux/drivers/media/dvb/frontends/or51211.c @@ -529,7 +529,7 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config, /* Allocate memory for the internal state */ state = kmalloc(sizeof(struct or51211_state), GFP_KERNEL); if (state == NULL) - goto error; + return NULL; /* Setup the state */ state->config = config; @@ -541,10 +541,6 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config, memcpy(&state->frontend.ops, &or51211_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; - -error: - kfree(state); - return NULL; } static struct dvb_frontend_ops or51211_ops = { diff --git a/linux/drivers/media/video/em28xx/em28xx-audio.c b/linux/drivers/media/video/em28xx/em28xx-audio.c index 901eeeb5c..e97446778 100644 --- a/linux/drivers/media/video/em28xx/em28xx-audio.c +++ b/linux/drivers/media/video/em28xx/em28xx-audio.c @@ -35,7 +35,7 @@ #include <linux/vmalloc.h> #include <linux/proc_fs.h> #include <linux/module.h> -#include <sound/driver.h> +#include "compat.h" #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> diff --git a/v4l/compat.h b/v4l/compat.h index cd3a7ac86..1d3400b88 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -14,6 +14,11 @@ #include <linux/i2c-dev.h> #endif +/* To allow alsa code to work */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) +#include <sound/driver.h> +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) # define set_freezable() #endif |