diff options
Diffstat (limited to 'drivers/staging/crystalhd/crystalhd_lnx.c')
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index a4ec891328cd..fbb80f09a3d9 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -15,11 +15,12 @@ along with this driver. If not, see <http://www.gnu.org/licenses/>. ***************************************************************************/ -#include <linux/smp_lock.h> +#include <linux/mutex.h> #include <linux/slab.h> #include "crystalhd_lnx.h" +static DEFINE_MUTEX(chd_dec_mutex); static struct class *crystalhd_class; static struct crystalhd_adp *g_adp_info; @@ -152,10 +153,8 @@ static int chd_dec_fetch_cdata(struct crystalhd_adp *adp, struct crystalhd_ioctl if (rc) { BCMLOG_ERR("failed to pull add_cdata sz:%x ua_off:%x\n", io->add_cdata_sz, (unsigned int)ua_off); - if (io->add_cdata) { - kfree(io->add_cdata); - io->add_cdata = NULL; - } + kfree(io->add_cdata); + io->add_cdata = NULL; return -ENODATA; } @@ -273,22 +272,22 @@ static long chd_dec_ioctl(struct file *fd, unsigned int cmd, unsigned long ua) return -EINVAL; } - uc = (struct crystalhd_user *)fd->private_data; + uc = fd->private_data; if (!uc) { BCMLOG_ERR("Failed to get uc\n"); return -ENODATA; } - lock_kernel(); + mutex_lock(&chd_dec_mutex); cproc = crystalhd_get_cmd_proc(&adp->cmds, cmd, uc); if (!cproc) { BCMLOG_ERR("Unhandled command: %d\n", cmd); - unlock_kernel(); + mutex_unlock(&chd_dec_mutex); return -EINVAL; } ret = chd_dec_api_cmd(adp, ua, uc->uid, cmd, cproc); - unlock_kernel(); + mutex_unlock(&chd_dec_mutex); return ret; } @@ -334,7 +333,7 @@ static int chd_dec_close(struct inode *in, struct file *fd) return -EINVAL; } - uc = (struct crystalhd_user *)fd->private_data; + uc = fd->private_data; if (!uc) { BCMLOG_ERR("Failed to get uc\n"); return -ENODATA; @@ -435,8 +434,7 @@ static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp) /* Clear iodata pool.. */ do { temp = chd_dec_alloc_iodata(adp, 0); - if (temp) - kfree(temp); + kfree(temp); } while (temp); crystalhd_delete_elem_pool(adp); |