Messages in this thread | | | Subject | Re: [PATCH 4/7] irda: Default to dongle type 9 on IBM hardware | From | Marcel Holtmann <> | Date | Mon, 21 Jul 2008 07:29:36 +0200 |
| |
Hi Matthew,
> CC: Samuel Ortiz <samuel@sortiz.org> > Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org> > Signed-off-by: Ben Collins <ben.collins@canonical.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; > +
this patch is in serious need of introducing some constants to be used with driver_data and not plain numbers. Also using a bitmask would be a good idea.
Regards
Marcel
| |