Signed-off-by: Thiago Farina <tfra...@gmail.com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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
On Fri, Nov 6, 2009 at 8:47 PM, Greg KH <gr...@kroah.com> 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?
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
Signed-off-by: Thiago Farina <tfra...@gmail.com>
---
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))
Still doesn't apply, I don't know what you are doing wrong here :(
odd.
greg k-h
'patch -p1 < your_email'
> I can try reproduce here and figure out what is wrong :/
Please do.
thanks,
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
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