From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: kernel-janitors@vger.kernel.org, linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: Replace kmemdup for kstrdup
Date: Sun, 23 Sep 2012 20:29:22 +0000 [thread overview]
Message-ID: <20120923172922.29f26f5d@infradead.org> (raw)
In-Reply-To: <1347281154-29515-1-git-send-email-peter.senna@gmail.com>
Em Mon, 10 Sep 2012 14:45:54 +0200
Peter Senna Tschudin <peter.senna@gmail.com> escreveu:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Replace kmemdup for kstrdup and cleaning up the code.
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Maintainers/interested parties not copied. Also:
Hunk #1 succeeded at 708 (offset 1 line).
Hunk #2 FAILED at 742.
1 out of 2 hunks FAILED -- saving rejects to file drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c.rej
tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
>
> ---
> It depends on the patch http://patchwork.linuxtv.org/patch/14231/
>
> tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
> 1 file changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> index 273df94..b663dac 100644
> --- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> +++ b/tmp/cx25821-video-upstream-ch2.c
> @@ -707,7 +707,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> int err = 0;
> int data_frame_size = 0;
> int risc_buffer_size = 0;
> - int str_length = 0;
>
> if (dev->_is_running_ch2) {
> pr_info("Video Channel is still running so return!\n");
> @@ -743,24 +742,16 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> risc_buffer_size = dev->_isNTSC_ch2 ?
> NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
>
> - if (dev->input_filename_ch2) {
> - str_length = strlen(dev->input_filename_ch2);
> - dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
> - str_length + 1, GFP_KERNEL);
> -
> - if (!dev->_filename_ch2) {
> - err = -ENOENT;
> - goto error;
> - }
> - } else {
> - str_length = strlen(dev->_defaultname_ch2);
> - dev->_filename_ch2 = kmemdup(dev->_defaultname_ch2,
> - str_length + 1, GFP_KERNEL);
> + if (dev->input_filename_ch2)
> + dev->_filename_ch2 = kstrdup(dev->input_filename_ch2,
> + GFP_KERNEL);
> + else
> + dev->_filename_ch2 = kstrdup(dev->_defaultname_ch2,
> + GFP_KERNEL);
>
> - if (!dev->_filename_ch2) {
> - err = -ENOENT;
> - goto error;
> - }
> + if (!dev->_filename_ch2) {
> + err = -ENOENT;
> + goto error;
> }
>
> /* Default if filename is empty string */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers,
Mauro
prev parent reply other threads:[~2012-09-23 20:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 13:46 [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code Peter Senna Tschudin
2012-09-10 12:45 ` [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: Replace kmemdup for kstrdup Peter Senna Tschudin
2012-09-23 20:29 ` Mauro Carvalho Chehab [this message]
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=20120923172922.29f26f5d@infradead.org \
--to=mchehab@infradead.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=peter.senna@gmail.com \
/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