From edb6bff9e524b5875b476c4728617e76c3613817 Mon Sep 17 00:00:00 2001 From: Chris Pascoe Date: Mon, 19 Nov 2007 04:45:38 -0300 Subject: [PATCH] --- yaml --- r: 76445 b: refs/heads/master c: aa501be989f5df58c4732d5eb1989e5ca6479d90 h: refs/heads/master i: 76443: db15f7061159ba3480b654103394663455ac771d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tuner-xc2028.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f9dfff80a2e2..a8aa3da9202f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91240dd92474d4124f80b00e6200052b275a99a1 +refs/heads/master: aa501be989f5df58c4732d5eb1989e5ca6479d90 diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c index a01231a0410d..ac7f3e1d32f4 100644 --- a/trunk/drivers/media/video/tuner-xc2028.c +++ b/trunk/drivers/media/video/tuner-xc2028.c @@ -44,6 +44,8 @@ MODULE_PARM_DESC(audio_std, "NICAM/B\n"); static LIST_HEAD(xc2028_list); +static DEFINE_MUTEX(xc2028_list_mutex); + /* struct for storing firmware table */ struct firmware_description { unsigned int type; @@ -854,6 +856,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe) tuner_dbg("%s called\n", __FUNCTION__); + mutex_lock(&xc2028_list_mutex); + priv->count--; if (!priv->count) { @@ -865,6 +869,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe) kfree(priv); } + mutex_unlock(&xc2028_list_mutex); + return 0; } @@ -940,6 +946,8 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg) video_dev = cfg->video_dev; + mutex_lock(&xc2028_list_mutex); + list_for_each_entry(priv, &xc2028_list, xc2028_list) { if (priv->video_dev == cfg->video_dev) { video_dev = NULL; @@ -949,8 +957,10 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg) if (video_dev) { priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (priv == NULL) + if (priv == NULL) { + mutex_unlock(&xc2028_list_mutex); return NULL; + } priv->bandwidth = BANDWIDTH_6_MHZ; priv->need_load_generic = 1; @@ -974,6 +984,8 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg) tuner_info("type set to %s\n", "XCeive xc2028/xc3028 tuner"); + mutex_unlock(&xc2028_list_mutex); + return fe; }