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

Commit 09f2082e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] usb drivers: use BUG_ON() instead of if () BUG 



Some USB drivers have a logic at the VB buffer handling like:
	if (in_interrupt())
		BUG();
Use, instead:
	BUG_ON(in_interrupt());

Btw, this logic looks weird on my eyes. We should convert them
to use VB2, in order to avoid those crappy things.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent fa8cb644

drivers/media/usb/cx231xx/cx231xx-417.c

+1 −2
Original line number Diff line number Diff line
@@ -1249,8 +1249,7 @@ static void free_buffer(struct videobuf_queue *vq, struct cx231xx_buffer *buf) 
	struct cx231xx *dev = fh->dev;

	unsigned long flags = 0;



	if (in_interrupt())

		BUG();

	BUG_ON(in_interrupt());



	spin_lock_irqsave(&dev->video_mode.slock, flags);

	if (dev->USE_ISO) {

drivers/media/usb/cx231xx/cx231xx-vbi.c

+1 −2
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ static void free_buffer(struct videobuf_queue *vq, struct cx231xx_buffer *buf) 
	struct cx231xx_fh *fh = vq->priv_data;

	struct cx231xx *dev = fh->dev;

	unsigned long flags = 0;

	if (in_interrupt())

		BUG();

	BUG_ON(in_interrupt());



	/* We used to wait for the buffer to finish here, but this didn't work

	   because, as we were keeping the state as VIDEOBUF_QUEUED,

drivers/media/usb/cx231xx/cx231xx-video.c

+1 −2
Original line number Diff line number Diff line
@@ -749,8 +749,7 @@ static void free_buffer(struct videobuf_queue *vq, struct cx231xx_buffer *buf) 
	struct cx231xx *dev = fh->dev;

	unsigned long flags = 0;



	if (in_interrupt())

		BUG();

	BUG_ON(in_interrupt());



	/* We used to wait for the buffer to finish here, but this didn't work

	   because, as we were keeping the state as VIDEOBUF_QUEUED,

drivers/media/usb/tm6000/tm6000-video.c

+1 −2
Original line number Diff line number Diff line
@@ -714,8 +714,7 @@ static void free_buffer(struct videobuf_queue *vq, struct tm6000_buffer *buf) 
	struct tm6000_core   *dev = fh->dev;

	unsigned long flags;



	if (in_interrupt())

		BUG();

	BUG_ON(in_interrupt());



	/* We used to wait for the buffer to finish here, but this didn't work

	   because, as we were keeping the state as VIDEOBUF_QUEUED,

drivers/media/usb/zr364xx/zr364xx.c

+1 −2
Original line number Diff line number Diff line
@@ -377,8 +377,7 @@ static void free_buffer(struct videobuf_queue *vq, struct zr364xx_buffer *buf) 
{

	_DBG("%s\n", __func__);



	if (in_interrupt())

		BUG();

	BUG_ON(in_interrupt());



	videobuf_vmalloc_free(&buf->vb);

	buf->vb.state = VIDEOBUF_NEEDS_INIT;