[PATCH 0/4] irda: IrDA updates for 2.6.26

[PATCH 0/4] irda: IrDA updates for 2.6.26

[Samuel Ortiz]

Hi Dave,

Here goes a 4 patches set for IrDA.
This is against your net-next-2.6 tree.

Cheers,
Samuel.

[PATCH 1/4] irda: via-ircc proper dma freeing

[Samuel Ortiz]

[-- Attachment #1: dma_cleanup.patch --]
[-- Type: text/plain, Size: 1077 bytes --]

From: Wang Chen <wangchen@cn.fujitsu.com>

1. dma should be freed when dma2 request fail.
2. dma2 should be freed too when device close.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
---
 drivers/net/irda/via-ircc.c |    3 +++
 1 file changed, 3 insertions(+)

Index: net-next-2.6/drivers/net/irda/via-ircc.c
===================================================================
--- net-next-2.6.orig/drivers/net/irda/via-ircc.c	2008-06-14 13:20:23.000000000 +0200
+++ net-next-2.6/drivers/net/irda/via-ircc.c	2008-06-14 13:25:18.000000000 +0200
@@ -1546,6 +1546,7 @@ static int via_ircc_net_open(struct net_
 			IRDA_WARNING("%s, unable to allocate dma2=%d\n",
 				     driver_name, self->io.dma2);
 			free_irq(self->io.irq, self);
+			free_dma(self->io.dma);
 			return -EAGAIN;
 		}
 	}
@@ -1606,6 +1607,8 @@ static int via_ircc_net_close(struct net
 	EnAllInt(iobase, OFF);
 	free_irq(self->io.irq, dev);
 	free_dma(self->io.dma);
+	if (self->io.dma2 != self->io.dma)
+		free_dma(self->io.dma2);
 
 	return 0;
 }

-- 

[PATCH 2/4] irda: Remove useless pm_dev references

[Samuel Ortiz]

[-- Attachment #1: irda_pm.patch --]
[-- Type: text/plain, Size: 2369 bytes --]

From: Rafael J. Wysocki <rjw-KKrjLPT3xs0@public.gmane.org>

Some IRDA headers contain references to 'struct pm_dev' that are not
necessary any more and may be removed.

Signed-off-by: Rafael J. Wysocki <rjw-KKrjLPT3xs0@public.gmane.org>
Acked-by: Pavel Machek <pavel-AlSwsSmVLrQ@public.gmane.org>
Signed-off-by: Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>
Cc: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
---
 drivers/net/irda/ali-ircc.h    |    2 --
 drivers/net/irda/au1000_ircc.h |    1 -
 drivers/net/irda/via-ircc.h    |    1 -
 3 files changed, 4 deletions(-)

Index: net-next-2.6/drivers/net/irda/au1000_ircc.h
===================================================================
--- net-next-2.6.orig/drivers/net/irda/au1000_ircc.h	2008-06-14 13:20:23.000000000 +0200
+++ net-next-2.6/drivers/net/irda/au1000_ircc.h	2008-06-14 13:25:18.000000000 +0200
@@ -122,6 +122,5 @@ struct au1k_private {
 	struct timer_list timer;
 
 	spinlock_t lock;           /* For serializing operations */
-        struct pm_dev *dev;
 };
 #endif /* AU1000_IRCC_H */
Index: net-next-2.6/drivers/net/irda/ali-ircc.h
===================================================================
--- net-next-2.6.orig/drivers/net/irda/ali-ircc.h	2008-06-14 13:20:23.000000000 +0200
+++ net-next-2.6/drivers/net/irda/ali-ircc.h	2008-06-14 13:25:18.000000000 +0200
@@ -219,8 +219,6 @@ struct ali_ircc_cb {
 	int index;                 /* Instance index */
 	
 	unsigned char fifo_opti_buf;
-
-        struct pm_dev *dev;
 };
 
 static inline void switch_bank(int iobase, int bank)
Index: net-next-2.6/drivers/net/irda/via-ircc.h
===================================================================
--- net-next-2.6.orig/drivers/net/irda/via-ircc.h	2008-06-14 13:20:23.000000000 +0200
+++ net-next-2.6/drivers/net/irda/via-ircc.h	2008-06-14 13:25:18.000000000 +0200
@@ -118,7 +118,6 @@ struct via_ircc_cb {
 	int index;		/* Instance index */
 
 	struct eventflag EventFlag;
-	struct pm_dev *dev;
 	unsigned int chip_id;	/* to remember chip id */
 	unsigned int RetryCount;
 	unsigned int RxDataReady;

-- 


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

[PATCH 3/4] irda: New device ID for nsc-ircc

[Samuel Ortiz]

[-- Attachment #1: nsc-ircc.patch --]
[-- Type: text/plain, Size: 908 bytes --]

From: Ville Syrjala <syrjala@sci.fi>

HP OmniBook 500's DSDT code changes the HID of the FIR device from
NSC6001 to HWPC224 when run under an "NT" operating system. Add the
new ID to the pnp device id table.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
---
 drivers/net/irda/nsc-ircc.c |    1 +
 1 file changed, 1 insertion(+)

Index: net-next-2.6/drivers/net/irda/nsc-ircc.c
===================================================================
--- net-next-2.6.orig/drivers/net/irda/nsc-ircc.c	2008-06-14 13:20:23.000000000 +0200
+++ net-next-2.6/drivers/net/irda/nsc-ircc.c	2008-06-30 20:44:23.000000000 +0200
@@ -152,6 +152,7 @@ static chipio_t pnp_info;
 static const struct pnp_device_id nsc_ircc_pnp_table[] = {
 	{ .id = "NSC6001", .driver_data = 0 },
 	{ .id = "IBM0071", .driver_data = 0 },
+	{ .id = "HWPC224", .driver_data = 0 },
 	{ }
 };
 

-- 

[PATCH 4/4] irda: Fix netlink error path return value

[Samuel Ortiz]

[-- Attachment #1: irda_nl.patch --]
[-- Type: text/plain, Size: 938 bytes --]

From: Julius Volz <juliusv@google.com>

Fix an incorrect return value check of genlmsg_put() in irda_nl_get_mode().
genlmsg_put() does not use ERR_PTR() to encode return values, it just
returns NULL on error.

Signed-off-by: Julius Volz <juliusv@google.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
---
 net/irda/irnetlink.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: net-next-2.6/net/irda/irnetlink.c
===================================================================
--- net-next-2.6.orig/net/irda/irnetlink.c	2008-06-14 13:20:33.000000000 +0200
+++ net-next-2.6/net/irda/irnetlink.c	2008-06-30 21:03:13.000000000 +0200
@@ -101,8 +101,8 @@ static int irda_nl_get_mode(struct sk_bu
 
 	hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq,
 			  &irda_nl_family, 0,  IRDA_NL_CMD_GET_MODE);
-	if (IS_ERR(hdr)) {
-		ret = PTR_ERR(hdr);
+	if (hdr == NULL) {
+		ret = -EMSGSIZE;
 		goto err_out;
 	}
 

-- 

Re: [PATCH 0/4] irda: IrDA updates for 2.6.26

[David Miller]

From: "Samuel Ortiz" <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>
Date: Mon, 30 Jun 2008 21:23:51 +0200

> Here goes a 4 patches set for IrDA.
> This is against your net-next-2.6 tree.

Except for patch 2, these all look like bug fixes.

So I think patches 1, 3, and 4 are likely good candidates
for net-2.6 and thus merging in to Linus for 2.6.26

What say you?

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

Re: [PATCH 0/4] irda: IrDA updates for 2.6.26

[Samuel Ortiz]

Hi Dave,

On Mon, Jun 30, 2008 at 12:59:54PM -0700, David Miller wrote:
> From: "Samuel Ortiz" <samuel@sortiz.org>
> Date: Mon, 30 Jun 2008 21:23:51 +0200
> 
> > Here goes a 4 patches set for IrDA.
> > This is against your net-next-2.6 tree.
> 
> Except for patch 2, these all look like bug fixes.
> 
> So I think patches 1, 3, and 4 are likely good candidates
> for net-2.6 and thus merging in to Linus for 2.6.26
> 
> What say you?
Sorry for the delay, spam assassin played tricks on me.
Yes, if you want to push 1,3 and 4 to net-2.6, it's really fine with
me.

Cheers,
Samuel.

Re: [PATCH 0/4] irda: IrDA updates for 2.6.26

[David Miller]

From: Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>
Date: Mon, 7 Jul 2008 13:08:41 +0200

> On Mon, Jun 30, 2008 at 12:59:54PM -0700, David Miller wrote:
> > Except for patch 2, these all look like bug fixes.
> > 
> > So I think patches 1, 3, and 4 are likely good candidates
> > for net-2.6 and thus merging in to Linus for 2.6.26
> > 
> > What say you?
> Sorry for the delay, spam assassin played tricks on me.
> Yes, if you want to push 1,3 and 4 to net-2.6, it's really fine with
> me.

Thanks, I'll take care of this tomorrow.

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08