[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <E1KKl4I-00068K-V7@swissweb.swissdisk.com>
Date: Sun, 20 Jul 2008 17:08:48 -0400
From: Matthew Garrett <mjg59@...f.ucam.org>
To: linux-kernel@...r.kernel.org
CC: Samuel Ortiz <samuel@...tiz.org>
Subject: [PATCH 4/7] irda: Default to dongle type 9 on IBM hardware
CC: Samuel Ortiz <samuel@...tiz.org>
Signed-off-by: Matthew Garrett <mjg59@...f.ucam.org>
Signed-off-by: Ben Collins <ben.collins@...onical.com>
---
drivers/net/irda/nsc-ircc.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index effc1ce..1ecb013 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -151,8 +151,8 @@ static char *dongle_types[] = {
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 },
+ { .id = "IBM0071", .driver_data = 1 },
{ }
};
@@ -934,6 +934,9 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i
* On my box, cfg_base is in the PnP descriptor of the
* motherboard. Oh well... Jean II */
+ if (id->driver_data == 1)
+ dongle_id = 0x9;
+
if (pnp_port_valid(dev, 0) &&
!(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED))
pnp_info.fir_base = pnp_port_start(dev, 0);
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists