On Mon, 21 Jul 2008 13:40:57 -0400 Ben Collins <ben.collins@canonical.com> wrote:

quoted text
> CC: Samuel Ortiz <samuel@sortiz.org>
> Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
> Signed-off-by: Ben Collins <ben.collins@canonical.com>
> 
> diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
> index effc1ce..18d1714 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 = NSC_FORCE_DONGLE_TYPE9 },
>  	{ }
>  };
>  
> @@ -930,7 +930,10 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i
>  	pnp_info.dma = -1;
>  	pnp_succeeded = 1;
>  
> -	/* There don't seem to be any way to get the cfg_base.
> +	if (id->driver_data & NSC_FORCE_DONGLE_TYPE9)
> +		dongle_id = 0x9;
> +
> +	/* There doesn't seem to be any way of getting the cfg_base.
>  	 * On my box, cfg_base is in the PnP descriptor of the
>  	 * motherboard. Oh well... Jean II */
>  
> diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
> index 29398a4..71cd3c5 100644
> --- a/drivers/net/irda/nsc-ircc.h
> +++ b/drivers/net/irda/nsc-ircc.h
> @@ -35,6 +35,9 @@
>  #include <linux/types.h>
>  #include <asm/io.h>
>  
> +/* Features for chips (set in driver_data) */
> +#define NSC_FORCE_DONGLE_TYPE9	0x00000001
> +
>  /* DMA modes needed */
>  #define DMA_TX_MODE     0x08    /* Mem to I/O, ++, demand. */
>  #define DMA_RX_MODE     0x04    /* I/O to mem, ++, demand. */
> 

The changelog doesn't exist^Wexplain the reasons for this patch.

I assume it fixes some bug?  What is it?
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/