*apdbg.c: use NULL pointer instead of 0 integer.
Signed-off-by: Thiago Farina <[email protected]>
---
drivers/staging/otus/apdbg.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/otus/apdbg.c b/drivers/staging/otus/apdbg.c
index d3e2f62..70a40b8 100644
--- a/drivers/staging/otus/apdbg.c
+++ b/drivers/staging/otus/apdbg.c
@@ -109,7 +109,7 @@ int set_ioctl(int sock, struct ifreq *req)
int read_reg(int sock, struct ifreq *req)
{
- struct zdap_ioctl *zdreq = 0;
+ struct zdap_ioctl *zdreq = NULL;
if (!set_ioctl(sock, req))
return -1;
@@ -123,7 +123,7 @@ int read_reg(int sock, struct ifreq *req)
int read_mem(int sock, struct ifreq *req)
{
- struct zdap_ioctl *zdreq = 0;
+ struct zdap_ioctl *zdreq = NULL;
int i;
if (!set_ioctl(sock, req))
--
1.6.5.1.61.ge79999
On Thu, Oct 29, 2009 at 08:04:26PM -0400, Thiago Farina wrote:
> *apdbg.c: use NULL pointer instead of 0 integer.
>
> Signed-off-by: Thiago Farina <[email protected]>
> ---
> drivers/staging/otus/apdbg.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/otus/apdbg.c b/drivers/staging/otus/apdbg.c
> index d3e2f62..70a40b8 100644
> --- a/drivers/staging/otus/apdbg.c
> +++ b/drivers/staging/otus/apdbg.c
> @@ -109,7 +109,7 @@ int set_ioctl(int sock, struct ifreq *req)
>
> int read_reg(int sock, struct ifreq *req)
> {
> - struct zdap_ioctl *zdreq = 0;
> + struct zdap_ioctl *zdreq = NULL;
The tabs somehow got converted to spaces in your patches, so they can't
be applied :(
care to rediff both of them?
thanks,
greg k-h
Hi Greg,
On Fri, Nov 6, 2009 at 8:47 PM, Greg KH <[email protected]> wrote:
> The tabs somehow got converted to spaces in your patches, so they can't
> be applied :(
I can't see spaces instead of tabs in this patch, may be you are
talking about other patch?
> care to rediff both of them?
Sure, but which?
On Fri, Nov 06, 2009 at 09:47:22PM -0200, Thiago Farina wrote:
> Hi Greg,
>
> On Fri, Nov 6, 2009 at 8:47 PM, Greg KH <[email protected]> wrote:
> > The tabs somehow got converted to spaces in your patches, so they can't
> > be applied :(
>
> I can't see spaces instead of tabs in this patch, may be you are
> talking about other patch?
Well, for some reason this patch would not apply at all, it looks like
there are no tabs in it.
> > care to rediff both of them?
> Sure, but which?
This one, and you sent another otus one, right?
thanks,
greg k-h
On Fri, Nov 6, 2009 at 9:47 PM, Thiago Farina <[email protected]> wrote:
> Hi Greg,
>
> On Fri, Nov 6, 2009 at 8:47 PM, Greg KH <[email protected]> wrote:
>> The tabs somehow got converted to spaces in your patches, so they can't
>> be applied :(
>
> I can't see spaces instead of tabs in this patch, may be you are
> talking about other patch?
Sorry Greg, I think my answer was rude. Please could you tell me if
this patch has spaces instead of tabs, or is another patch that I
sent? If so, just point me, then I will make all the corrections.
On Fri, Nov 6, 2009 at 10:07 PM, Greg KH <[email protected]> wrote:
> Well, for some reason this patch would not apply at all, it looks like
> there are no tabs in it.
I will rebase it and send it again. I hope it will works this time :)
*apdbg.c: use NULL pointer instead of 0 integer.
Signed-off-by: Thiago Farina <[email protected]>
---
drivers/staging/otus/apdbg.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/otus/apdbg.c b/drivers/staging/otus/apdbg.c
index d3e2f62..70a40b8 100644
--- a/drivers/staging/otus/apdbg.c
+++ b/drivers/staging/otus/apdbg.c
@@ -109,7 +109,7 @@ int set_ioctl(int sock, struct ifreq *req)
int read_reg(int sock, struct ifreq *req)
{
- struct zdap_ioctl *zdreq = 0;
+ struct zdap_ioctl *zdreq = NULL;
if (!set_ioctl(sock, req))
return -1;
@@ -123,7 +123,7 @@ int read_reg(int sock, struct ifreq *req)
int read_mem(int sock, struct ifreq *req)
{
- struct zdap_ioctl *zdreq = 0;
+ struct zdap_ioctl *zdreq = NULL;
int i;
if (!set_ioctl(sock, req))
On Fri, Nov 06, 2009 at 11:45:05PM -0200, Thiago Farina wrote:
> *apdbg.c: use NULL pointer instead of 0 integer.
>
> Signed-off-by: Thiago Farina <[email protected]>
Still doesn't apply, I don't know what you are doing wrong here :(
odd.
greg k-h
Hi Greg,
On Thu, Nov 19, 2009 at 5:34 PM, Greg KH <[email protected]> wrote:
> On Fri, Nov 06, 2009 at 11:45:05PM -0200, Thiago Farina wrote:
>> *apdbg.c: use NULL pointer instead of 0 integer.
>>
>> Signed-off-by: Thiago Farina <[email protected]>
>
> Still doesn't apply, I don't know what you are doing wrong here :(
>
> odd.
How are you applying it?
I can try reproduce here and figure out what is wrong :/
On Fri, Nov 20, 2009 at 05:18:09PM -0200, Thiago Farina wrote:
> Hi Greg,
>
> On Thu, Nov 19, 2009 at 5:34 PM, Greg KH <[email protected]> wrote:
> > On Fri, Nov 06, 2009 at 11:45:05PM -0200, Thiago Farina wrote:
> >> *apdbg.c: use NULL pointer instead of 0 integer.
> >>
> >> Signed-off-by: Thiago Farina <[email protected]>
> >
> > Still doesn't apply, I don't know what you are doing wrong here :(
> >
> > odd.
>
> How are you applying it?
'patch -p1 < your_email'
> I can try reproduce here and figure out what is wrong :/
Please do.
thanks,
greg k-h
On Fri, Nov 20, 2009 at 5:22 PM, Greg KH <[email protected]> wrote:
> On Fri, Nov 20, 2009 at 05:18:09PM -0200, Thiago Farina wrote:
>> Hi Greg,
>>
>> On Thu, Nov 19, 2009 at 5:34 PM, Greg KH <[email protected]> wrote:
>> > On Fri, Nov 06, 2009 at 11:45:05PM -0200, Thiago Farina wrote:
>> >> *apdbg.c: use NULL pointer instead of 0 integer.
>> >>
>> >> Signed-off-by: Thiago Farina <[email protected]>
>> >
>> > Still doesn't apply, I don't know what you are doing wrong here :(
>> >
>> > odd.
>>
>> How are you applying it?
>
> 'patch -p1 < your_email'
Are you getting something like: "Hmm... Ignoring the trailing garbage." ?
The output for me was this:
...
Patching file drivers/staging/otus/apdbg.c using Plan A...
Hunk #1 succeeded at 109.
Hunk #2 succeeded at 123.
Hmm... Ignoring the trailing garbage.
done
On Fri, Nov 20, 2009 at 06:09:09PM -0200, Thiago Farina wrote:
> On Fri, Nov 20, 2009 at 5:22 PM, Greg KH <[email protected]> wrote:
> > On Fri, Nov 20, 2009 at 05:18:09PM -0200, Thiago Farina wrote:
> >> Hi Greg,
> >>
> >> On Thu, Nov 19, 2009 at 5:34 PM, Greg KH <[email protected]> wrote:
> >> > On Fri, Nov 06, 2009 at 11:45:05PM -0200, Thiago Farina wrote:
> >> >> *apdbg.c: use NULL pointer instead of 0 integer.
> >> >>
> >> >> Signed-off-by: Thiago Farina <[email protected]>
> >> >
> >> > Still doesn't apply, I don't know what you are doing wrong here :(
> >> >
> >> > odd.
> >>
> >> How are you applying it?
> >
> > 'patch -p1 < your_email'
>
> Are you getting something like: "Hmm... Ignoring the trailing garbage." ?
>
> The output for me was this:
> ...
> Patching file drivers/staging/otus/apdbg.c using Plan A...
> Hunk #1 succeeded at 109.
> Hunk #2 succeeded at 123.
> Hmm... Ignoring the trailing garbage.
> done
Are you appling this to the linux-next tree? Or Linus's tree? I just
get a failure against linux-next.
thanks,
greg k-h
On Fri, Nov 20, 2009 at 6:15 PM, Greg KH <[email protected]> wrote:
> On Fri, Nov 20, 2009 at 06:09:09PM -0200, Thiago Farina wrote:
>> On Fri, Nov 20, 2009 at 5:22 PM, Greg KH <[email protected]> wrote:
>> > On Fri, Nov 20, 2009 at 05:18:09PM -0200, Thiago Farina wrote:
>> >> Hi Greg,
>> >>
>> >> On Thu, Nov 19, 2009 at 5:34 PM, Greg KH <[email protected]> wrote:
>> >> > On Fri, Nov 06, 2009 at 11:45:05PM -0200, Thiago Farina wrote:
>> >> >> *apdbg.c: use NULL pointer instead of 0 integer.
>> >> >>
>> >> >> Signed-off-by: Thiago Farina <[email protected]>
>> >> >
>> >> > Still doesn't apply, I don't know what you are doing wrong here :(
>> >> >
>> >> > odd.
>> >>
>> >> How are you applying it?
>> >
>> > 'patch -p1 < your_email'
>>
>> Are you getting something like: "Hmm... Ignoring the trailing garbage." ?
>>
>> The output for me was this:
>> ...
>> Patching file drivers/staging/otus/apdbg.c using Plan A...
>> Hunk #1 succeeded at 109.
>> Hunk #2 succeeded at 123.
>> Hmm... Ignoring the trailing garbage.
>> done
>
> Are you appling this to the linux-next tree? Or Linus's tree? I just
> get a failure against linux-next.
I'm applying it to the Linus's tree.
On Fri, Nov 20, 2009 at 07:22:59PM -0200, Thiago Farina wrote:
> On Fri, Nov 20, 2009 at 6:15 PM, Greg KH <[email protected]> wrote:
> > On Fri, Nov 20, 2009 at 06:09:09PM -0200, Thiago Farina wrote:
> >> On Fri, Nov 20, 2009 at 5:22 PM, Greg KH <[email protected]> wrote:
> >> > On Fri, Nov 20, 2009 at 05:18:09PM -0200, Thiago Farina wrote:
> >> >> Hi Greg,
> >> >>
> >> >> On Thu, Nov 19, 2009 at 5:34 PM, Greg KH <[email protected]> wrote:
> >> >> > On Fri, Nov 06, 2009 at 11:45:05PM -0200, Thiago Farina wrote:
> >> >> >> *apdbg.c: use NULL pointer instead of 0 integer.
> >> >> >>
> >> >> >> Signed-off-by: Thiago Farina <[email protected]>
> >> >> >
> >> >> > Still doesn't apply, I don't know what you are doing wrong here :(
> >> >> >
> >> >> > odd.
> >> >>
> >> >> How are you applying it?
> >> >
> >> > 'patch -p1 < your_email'
> >>
> >> Are you getting something like: "Hmm... Ignoring the trailing garbage." ?
> >>
> >> The output for me was this:
> >> ...
> >> Patching file drivers/staging/otus/apdbg.c using Plan A...
> >> Hunk #1 succeeded at 109.
> >> Hunk #2 succeeded at 123.
> >> Hmm... ?Ignoring the trailing garbage.
> >> done
> >
> > Are you appling this to the linux-next tree? ?Or Linus's tree? ?I just
> > get a failure against linux-next.
>
> I'm applying it to the Linus's tree.
Please generate it against linux-next, as there are already otus patches
in my tree, which is included in the linux-next snapshots.
thanks,
greg k-h