headers
Ville Syrjala | 23 Jun 2008 14:02
Picon

[PATCH] nsc-ircc: Add HWPC224 pnp id for HP OmniBook 500

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@...>
---
 drivers/net/irda/nsc-ircc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index a7714da..effc1ce 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
 <at>  <at>  -152,6 +152,7  <at>  <at>  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 },
 	{ }
 };

--

-- 
1.5.4.5

-------------------------------------------------------------------------
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
(Continue reading)

Permalink | Reply | 0 comments |
headers
Samuel Ortiz | 30 Jun 2008 21:23

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

Hi Dave,

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

Cheers,
Samuel.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Permalink | Reply | 14 comments |
headers
Samuel Ortiz | 30 Jun 2008 21:23

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

From: Wang Chen <wangchen <at> 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 <at> cn.fujitsu.com>
Signed-off-by: Samuel Ortiz <samuel <at> 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
 <at>  <at>  -1546,6 +1546,7  <at>  <at>  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;
 		}
 	}
 <at>  <at>  -1606,6 +1607,8  <at>  <at>  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);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Samuel Ortiz | 30 Jun 2008 21:23

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

From: Rafael J. Wysocki <rjw@...>

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@...>
Acked-by: Pavel Machek <pavel@...>
Signed-off-by: Samuel Ortiz <samuel@...>
Cc: Andrew Morton <akpm@...>
---
 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
 <at>  <at>  -122,6 +122,5  <at>  <at>  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
(Continue reading)

Permalink | Reply | 0 comments |
headers
Samuel Ortiz | 30 Jun 2008 21:23

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

From: Julius Volz <juliusv <at> 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 <at> google.com>
Signed-off-by: Samuel Ortiz <samuel <at> 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
 <at>  <at>  -101,8 +101,8  <at>  <at>  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;
 	}

--

-- 

--
(Continue reading)

Permalink | Reply | 0 comments |
headers
Samuel Ortiz | 30 Jun 2008 21:23

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

From: Ville Syrjala <syrjala <at> 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 <at> sci.fi>
Signed-off-by: Samuel Ortiz <samuel <at> 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
 <at>  <at>  -152,6 +152,7  <at>  <at>  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 },
 	{ }
 };

--

-- 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
(Continue reading)

Permalink | Reply | 0 comments |
headers
David Miller | 30 Jun 2008 21:59
Favicon

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

From: "Samuel Ortiz" <samuel@...>
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
Permalink | Reply | 4 comments |

Gmane