[PATCH V3] ALSA: pcm: Fix couple of typos
s/unconditonally/unconditionally/ s/succesful/successful/
Signed-off-by: Bhaskar Chowdhury unixbhaskar@gmail.com --- Changes from V2: Takashi pointed out that the patch was not applicable due to some unwanted stuff get into it. Resending it with the new patch creation.
sound/core/pcm_native.c | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 17a85f4815d5..afb670d7fd53 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1425,7 +1425,7 @@ static int snd_pcm_do_stop(struct snd_pcm_substream *substream, substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_STOP); substream->runtime->stop_operating = true; } - return 0; /* unconditonally stop all substreams */ + return 0; /* unconditionally stop all substreams */ }
static void snd_pcm_post_stop(struct snd_pcm_substream *substream, @@ -1469,7 +1469,7 @@ EXPORT_SYMBOL(snd_pcm_stop); * After stopping, the state is changed to SETUP. * Unlike snd_pcm_stop(), this affects only the given stream. * - * Return: Zero if succesful, or a negative error code. + * Return: Zero if successful, or a negative error code. -- 2.30.1
On Thu, 25 Mar 2021 10:06:09 +0100, Bhaskar Chowdhury wrote:
s/unconditonally/unconditionally/ s/succesful/successful/
Signed-off-by: Bhaskar Chowdhury unixbhaskar@gmail.com
Changes from V2: Takashi pointed out that the patch was not applicable due to some unwanted stuff get into it. Resending it with the new patch creation.
Hrm, still not applicable. Can you apply the patch from your own post via git-am in your side?
Takashi
On 10:37 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:06:09 +0100, Bhaskar Chowdhury wrote:
s/unconditonally/unconditionally/ s/succesful/successful/
Signed-off-by: Bhaskar Chowdhury unixbhaskar@gmail.com
Changes from V2: Takashi pointed out that the patch was not applicable due to some unwanted stuff get into it. Resending it with the new patch creation.
Hrm, still not applicable. Can you apply the patch from your own post via git-am in your side?
Here is what I do for this specific case :
✔ ~/git-linux/linux-next [patch L|✔] 15:18 $ sed -i 's/unconditonally/unconditionally/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ sed -i 's/succesful/successful/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:19 $ git ci "Fix some patch error" [patch 88d5af187dbb] Fix some patch error 1 file changed, 2 insertions(+), 2 deletions(-)
15:21 $ git_fetch_single_file.sh sound/core/pcm_native.c Looks alright!✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git ci "Bring for patch" [patch 352e1ce8dacf] Bring for patch 1 file changed, 2 insertions(+), 2 deletions(-) ✔ ~/git-linux/linux-next [patch L|✔] 15:22 $ git apply --verbose 0001-Made-patche-for-this.patch Checking patch sound/core/pcm_native.c... Applied patch sound/core/pcm_native.c cleanly.
Takashi
On Thu, 25 Mar 2021 10:56:39 +0100, Bhaskar Chowdhury wrote:
On 10:37 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:06:09 +0100, Bhaskar Chowdhury wrote:
s/unconditonally/unconditionally/ s/succesful/successful/
Signed-off-by: Bhaskar Chowdhury unixbhaskar@gmail.com
Changes from V2: Takashi pointed out that the patch was not applicable due to some unwanted stuff get into it. Resending it with the new patch creation.
Hrm, still not applicable. Can you apply the patch from your own post via git-am in your side?
Here is what I do for this specific case :
✔ ~/git-linux/linux-next [patch L|✔] 15:18 $ sed -i 's/unconditonally/unconditionally/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ sed -i 's/succesful/successful/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:19 $ git ci "Fix some patch error" [patch 88d5af187dbb] Fix some patch error 1 file changed, 2 insertions(+), 2 deletions(-)
15:21 $ git_fetch_single_file.sh sound/core/pcm_native.c Looks alright!✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git ci "Bring for patch" [patch 352e1ce8dacf] Bring for patch 1 file changed, 2 insertions(+), 2 deletions(-) ✔ ~/git-linux/linux-next [patch L|✔] 15:22 $ git apply --verbose 0001-Made-patche-for-this.patch Checking patch sound/core/pcm_native.c... Applied patch sound/core/pcm_native.c cleanly.
I meant to try to apply the patch from mail fetched from the ML, not the patch you made from your git tree.
Takashi
On 11:47 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:56:39 +0100, Bhaskar Chowdhury wrote:
On 10:37 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:06:09 +0100, Bhaskar Chowdhury wrote:
s/unconditonally/unconditionally/ s/succesful/successful/
Signed-off-by: Bhaskar Chowdhury unixbhaskar@gmail.com
Changes from V2: Takashi pointed out that the patch was not applicable due to some unwanted stuff get into it. Resending it with the new patch creation.
Hrm, still not applicable. Can you apply the patch from your own post via git-am in your side?
Here is what I do for this specific case :
✔ ~/git-linux/linux-next [patch L|✔] 15:18 $ sed -i 's/unconditonally/unconditionally/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ sed -i 's/succesful/successful/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:19 $ git ci "Fix some patch error" [patch 88d5af187dbb] Fix some patch error 1 file changed, 2 insertions(+), 2 deletions(-)
15:21 $ git_fetch_single_file.sh sound/core/pcm_native.c Looks alright!✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git ci "Bring for patch" [patch 352e1ce8dacf] Bring for patch 1 file changed, 2 insertions(+), 2 deletions(-) ✔ ~/git-linux/linux-next [patch L|✔] 15:22 $ git apply --verbose 0001-Made-patche-for-this.patch Checking patch sound/core/pcm_native.c... Applied patch sound/core/pcm_native.c cleanly.
I meant to try to apply the patch from mail fetched from the ML, not the patch you made from your git tree.
Hmmmmmm
bhaskar@debian_16:18:41_Thu Mar 25 :~> mutt Applying: ALSA: pcm: Fix couple of typos error: corrupt patch at line 29 Patch failed at 0001 ALSA: pcm: Fix couple of typos hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Press any key to continue...
Something bugging it ....
Takashi
On 3/25/21 5:07 AM, Bhaskar Chowdhury wrote:
On 11:47 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:56:39 +0100, Bhaskar Chowdhury wrote:
On 10:37 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:06:09 +0100, Bhaskar Chowdhury wrote:
s/unconditonally/unconditionally/ s/succesful/successful/
Signed-off-by: Bhaskar Chowdhury unixbhaskar@gmail.com
Changes from V2: Takashi pointed out that the patch was not applicable due to some unwanted stuff get into it. Resending it with the new patch creation.
Hrm, still not applicable. Can you apply the patch from your own post via git-am in your side?
Here is what I do for this specific case :
✔ ~/git-linux/linux-next [patch L|✔] 15:18 $ sed -i 's/unconditonally/unconditionally/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ sed -i 's/succesful/successful/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:19 $ git ci "Fix some patch error" [patch 88d5af187dbb] Fix some patch error 1 file changed, 2 insertions(+), 2 deletions(-)
15:21 $ git_fetch_single_file.sh sound/core/pcm_native.c Looks alright!✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git ci "Bring for patch" [patch 352e1ce8dacf] Bring for patch 1 file changed, 2 insertions(+), 2 deletions(-) ✔ ~/git-linux/linux-next [patch L|✔] 15:22 $ git apply --verbose 0001-Made-patche-for-this.patch Checking patch sound/core/pcm_native.c... Applied patch sound/core/pcm_native.c cleanly.
I meant to try to apply the patch from mail fetched from the ML, not the patch you made from your git tree.
Hmmmmmm
bhaskar@debian_16:18:41_Thu Mar 25 :~> mutt Applying: ALSA: pcm: Fix couple of typos error: corrupt patch at line 29 Patch failed at 0001 ALSA: pcm: Fix couple of typos hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Press any key to continue...
I get:
patch: **** malformed patch at line 40: 2.30.1
which is this block:
@@ -1469,7 +1469,7 @@ EXPORT_SYMBOL(snd_pcm_stop); * After stopping, the state is changed to SETUP. * Unlike snd_pcm_stop(), this affects only the given stream. * - * Return: Zero if succesful, or a negative error code. + * Return: Zero if successful, or a negative error code. -- 2.30.1
That means that this "diff" block should contain 7 lines of contextual diff source code, but the trailing 2 lines are missing (after the "+" line). I don't know how that happens.
~Randy
On 17:37 Thu 25 Mar 2021, Bhaskar Chowdhury wrote:
On 11:47 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:56:39 +0100, Bhaskar Chowdhury wrote:
On 10:37 Thu 25 Mar 2021, Takashi Iwai wrote:
On Thu, 25 Mar 2021 10:06:09 +0100, Bhaskar Chowdhury wrote:
s/unconditonally/unconditionally/ s/succesful/successful/
Signed-off-by: Bhaskar Chowdhury unixbhaskar@gmail.com
Changes from V2: Takashi pointed out that the patch was not applicable due to some unwanted stuff get into it. Resending it with the new patch creation.
Hrm, still not applicable. Can you apply the patch from your own post via git-am in your side?
Here is what I do for this specific case :
✔ ~/git-linux/linux-next [patch L|✔] 15:18 $ sed -i 's/unconditonally/unconditionally/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ sed -i 's/succesful/successful/' sound/core/pcm_native.c ✔ ~/git-linux/linux-next [patch L|✚ 1] 15:19 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:19 $ git ci "Fix some patch error" [patch 88d5af187dbb] Fix some patch error 1 file changed, 2 insertions(+), 2 deletions(-)
15:21 $ git_fetch_single_file.sh sound/core/pcm_native.c Looks alright!✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git add . ✔ ~/git-linux/linux-next [patch L|●1] 15:21 $ git ci "Bring for patch" [patch 352e1ce8dacf] Bring for patch 1 file changed, 2 insertions(+), 2 deletions(-) ✔ ~/git-linux/linux-next [patch L|✔] 15:22 $ git apply --verbose 0001-Made-patche-for-this.patch Checking patch sound/core/pcm_native.c... Applied patch sound/core/pcm_native.c cleanly.
I meant to try to apply the patch from mail fetched from the ML, not the patch you made from your git tree.
Hmmmmmm
bhaskar@debian_16:18:41_Thu Mar 25 :~> mutt Applying: ALSA: pcm: Fix couple of typos error: corrupt patch at line 29 Patch failed at 0001 ALSA: pcm: Fix couple of typos hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Press any key to continue...
Something bugging it ....
Takashi
Okay ,I have sent a V4 now and it seems working ....when I did a "git am from mutt" and the result is getting reflected on linux-next file.
Takashi, could you please give it another shot....
~Bhaskar
participants (3)
-
Bhaskar Chowdhury -
Randy Dunlap -
Takashi Iwai