irda: IrDA updates for 2.6.26
Subsystems (2)
cover 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.
PATCH 2/4 irda: Remove useless pm_dev references
From: Rafael J. Wysocki <[email protected]>
Some IRDA headers contain references to 'struct pm_dev' that are not necessary any more and may be removed.
--- 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(-)
drivers/net/irda/au1000_ircc.h +0 -1
@@ -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 */
drivers/net/irda/ali-ircc.h +0 -2
@@ -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)
drivers/net/irda/via-ircc.h +0 -1
@@ -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;
Signature · 5 lines
------------------------------------------------------------------------- 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 1/4 irda: via-ircc proper dma freeing
In reply to Samuel OrtizFrom: Wang Chen <[email protected]>
1. dma should be freed when dma2 request fail.
2. dma2 should be freed too when device close.
--- drivers/net/irda/via-ircc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/irda/via-ircc.c +3 -0
@@ -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 netEnAllInt (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 3/4 irda: New device ID for nsc-ircc
In reply to Samuel OrtizFrom: Ville Syrjala <[email protected]>
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.
--- drivers/net/irda/nsc-ircc.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/irda/nsc-ircc.c +1 -0
@@ -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
In reply to Samuel OrtizFrom: Julius Volz <[email protected]>
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.
--- net/irda/irnetlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/irda/irnetlink.c +2 -2
@@ -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; }
A message that is not in the archive (sent off-list or not yet received): [email protected]
From: "Samuel Ortiz" <[email protected]>
Date: Mon, 30 Jun 2008 21:23:51 +0200
Quoted 2 lines
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
Hi Dave,
Quoted 6 lines · David Miller
From: "Samuel Ortiz" <[email protected]>
Date: Mon, 30 Jun 2008 21:23:51 +0200Quoted 2 lines
Here goes a 4 patches set for IrDA.
This is against your net-next-2.6 tree.
Quoted 6 lines
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.
A message that is not in the archive (sent off-list or not yet received): [email protected]
From: Samuel Ortiz <[email protected]>
Date: Mon, 7 Jul 2008 13:08:41 +0200
Quoted 10 lines · David Miller
Quoted 6 lines
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