[PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

[srishti sharma]

On Wed, Jun 14, 2017 at 7:19 PM, Greg KH <gregkh at linuxfoundation.org> wrote:
> On Wed, Jun 14, 2017 at 07:11:01PM +0530, srishti sharma wrote:
>> On Wed, Jun 14, 2017 at 10:39 AM, Greg KH <gregkh at linuxfoundation.org> wrote:
>> > On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
>> >> On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter <dan.carpenter at oracle.com> wrote:
>> >> > On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
>> >> >> On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh at linuxfoundation.org> wrote:
>> >> >> > On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
>> >> >> >> Fixed alignment so that it matched open parenthesis.
>> >> >> >>
>> >> >> >> Signed-off-by: srishti sharma <srishtishar at gmail.com>
>> >> >> >> ---
>> >> >> >>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
>> >> >> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >> >> >>
>> >> >> >> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> >> index f484bb0..2148ed0 100644
>> >> >> >> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> >> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> >> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
>> >> >> >>  }
>> >> >> >>
>> >> >> >>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
>> >> >> >> -                             struct snd_ctl_elem_value *ucontrol)
>> >> >> >> +                            struct snd_ctl_elem_value *ucontrol)
>> >> >> >>  {
>> >> >> >>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>> >> >> >>       int changed = 0;
>> >> >> >
>> >> >> > This patch is corrupted and can not be applied :(
>> >> >>
>> >> >>
>> >> >> Why is this corrupted ?
>> >> >
>> >> > Try applying it with `git am`.  There should be space characters at the
>> >> > start of these lines but your email client deleted them:
>> >> >
>> >> >         struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>> >> >         int changed = 0;
>> >> >
>> >> > Read Documentation/process/email-clients.rst
>> >> >
>> >> > regards,
>> >> > dan carpenter
>> >>
>> >>
>> >> Hello,
>> >>
>> >> I tried applying it with ' git am ' and it was giving me this error:
>> >>
>> >> fatal: corrupt patch at line XX
>> >
>> > Exactly.
>> >
>> >> I think this was produced because of running ./scripts/cleanfile on the patch .
>> >
>> > Why would you do that?  By doing that you corrupted the patch file :(
>>
>> After I run ./scritps/checkpatch.pl on the patch produced by git
>> format-patch it has trailing whitespaces . So I was using
>> ./scripts/cleanfile to fix that , I am not doing that anymore and am
>> also not getting the corrupt patch error .
>
> That means your code had trailing whitespaces, always fix that and NEVER
> hand-edit or modify a patch unless you really know what you are doing.
>
>> > Just use the proper output of 'git format-patch' and all will be fine.
>>
>> I have done this and am still getting these errors:
>>
>> error: patch failed:
>> drivers/staging/vc04_services/bcm2835-audio/bcm2835-      ctl.c:105
>>
>> error: drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:
>> patch does not apply
>>
>>
>> Why is it not applying ?
>
> That is up to you to figure out, we have no idea as to exactly what you
> are doing :)

I guess , I was applying the patch to the same repository I made the
change in :P , I am not getting any errors now .
>
> good luck!
>
> greg k-h

Regards,
Srishti