From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Bee Hock Goh <beehock@gmail.com>
Cc: LMML <linux-media@vger.kernel.org>
Subject: Re: [PATCH] tm6000: Prevent Kernel Oops changing channel when stream is still on.
Date: Sun, 02 May 2010 11:42:45 -0300 [thread overview]
Message-ID: <4BDD8F65.80602@redhat.com> (raw)
In-Reply-To: <u2s6e8e83e21005010151ie123c8e5o45e7d0a3bbc8aa64@mail.gmail.com>
Hi Bee,
Bee Hock Goh wrote:
> do a streamoff before setting standard to prevent kernel oops by
> irq_callback if changing of channel is done while streaming is still
> on-going.
>
>
> Signed-off-by: Bee Hock Goh <beehock@gmail.com>
>
> diff --git a/drivers/staging/tm6000/tm6000-video.c
> b/drivers/staging/tm6000/tm6000-video.c
> index c53de47..32f625d 100644
> --- a/drivers/staging/tm6000/tm6000-video.c
> +++ b/drivers/staging/tm6000/tm6000-video.c
>
> @@ -1081,8 +1086,8 @@ static int vidioc_s_std (struct file *file, void
> *priv, v4l2_std_id *norm)
> struct tm6000_fh *fh=priv;
> struct tm6000_core *dev = fh->dev;
>
> + vidioc_streamoff(file, priv, V4L2_BUF_TYPE_VIDEO_CAPTURE);
> rc=tm6000_set_standard (dev, norm);
> -
> fh->width = dev->width;
> fh->height = dev->height;
This doesn't seem to be the right thing to do. The problem here is that
changing a video standard takes a long time to happen. As calling an
ioctl is protected by KBL, QBUF/DQBUF won't be called, so, the driver
will run out of the buffers, and *buf will become null. This can eventually
happen during copy_streams().
---
tm6000: Fix a panic if buffer become NULL
Changing a video standard takes a long time to happen on tm6000, since it
needs to load another firmware, and the i2c implementation on this device
is really slow. As calling an ioctl is protected by KBL, QBUF/DQBUF won't
be called, so, the driver will run out of the buffers, and *buf will become
NULL. This can eventually happen during copy_streams(). The fix is to leave
the URB copy loop, if there's no more buffers available.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/linux/drivers/staging/tm6000/tm6000-video.c b/linux/drivers/staging/tm6000/tm6000-video.c
--- a/linux/drivers/staging/tm6000/tm6000-video.c
+++ b/linux/drivers/staging/tm6000/tm6000-video.c
@@ -539,7 +539,7 @@ static inline int tm6000_isoc_copy(struc
}
}
copied += len;
- if (copied>=size)
+ if (copied >= size || !buf)
break;
// }
}
next prev parent reply other threads:[~2010-05-02 14:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-01 8:51 [PATCH] tm6000: Prevent Kernel Oops changing channel when stream is still on Bee Hock Goh
2010-05-02 14:42 ` Mauro Carvalho Chehab [this message]
2010-05-02 17:26 ` Mauro Carvalho Chehab
2010-05-03 0:08 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BDD8F65.80602@redhat.com \
--to=mchehab@redhat.com \
--cc=beehock@gmail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox