Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1439cdb0 authored by Binoy Jayan's avatar Binoy Jayan Committed by Mauro Carvalho Chehab
Browse files

media: ngene: Replace semaphore cmd_mutex with mutex 



The semaphore 'cmd_mutex' is used as a simple mutex, so
it should be written as one. Also, replace down with
mutex_destroy to ensure sane state when ngene_stop is
called.

Signed-off-by: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent f7d84fa7

drivers/media/pci/ngene/ngene-core.c

+6 −6
Original line number Diff line number Diff line
@@ -336,9 +336,9 @@ int ngene_command(struct ngene *dev, struct ngene_command *com) 
{

	int result;



	down(&dev->cmd_mutex);

	mutex_lock(&dev->cmd_mutex);

	result = ngene_command_mutex(dev, com);

	up(&dev->cmd_mutex);

	mutex_unlock(&dev->cmd_mutex);

	return result;

}
@@ -1283,7 +1283,7 @@ static int ngene_load_firm(struct ngene *dev) 


static void ngene_stop(struct ngene *dev)

{

	down(&dev->cmd_mutex);

	mutex_destroy(&dev->cmd_mutex);

	i2c_del_adapter(&(dev->channel[0].i2c_adapter));

	i2c_del_adapter(&(dev->channel[1].i2c_adapter));

	ngwritel(0, NGENE_INT_ENABLE);
@@ -1346,7 +1346,7 @@ static int ngene_start(struct ngene *dev) 
	init_waitqueue_head(&dev->cmd_wq);

	init_waitqueue_head(&dev->tx_wq);

	init_waitqueue_head(&dev->rx_wq);

	sema_init(&dev->cmd_mutex, 1);

	mutex_init(&dev->cmd_mutex);

	sema_init(&dev->stream_mutex, 1);

	sema_init(&dev->pll_mutex, 1);

	sema_init(&dev->i2c_switch_mutex, 1);
@@ -1606,10 +1606,10 @@ static void ngene_unlink(struct ngene *dev) 
	com.in_len = 3;

	com.out_len = 1;



	down(&dev->cmd_mutex);

	mutex_lock(&dev->cmd_mutex);

	ngwritel(0, NGENE_INT_ENABLE);

	ngene_command_mutex(dev, &com);

	up(&dev->cmd_mutex);

	mutex_unlock(&dev->cmd_mutex);

}



void ngene_shutdown(struct pci_dev *pdev)

drivers/media/pci/ngene/ngene.h

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ struct ngene { 


	wait_queue_head_t     cmd_wq;

	int                   cmd_done;

	struct semaphore      cmd_mutex;

	struct mutex          cmd_mutex;

	struct semaphore      stream_mutex;

	struct semaphore      pll_mutex;

	struct semaphore      i2c_switch_mutex;