From b3d3ec4d9c54f3d702da495f1ab89a236636c5a8 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 9 Jan 2013 10:12:14 +0300 Subject: [PATCH] --- yaml --- r: 354011 b: refs/heads/master c: c803dd48f0539cb6adcbbcf41c758502e1e102cb h: refs/heads/master i: 354009: 8a027c31f9e51e18adb4320c86569adce120b215 354007: dd48bfa06b16ad2d153431dbf54bd5cc54294220 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sb105x/sb_mp_register.h | 2 +- trunk/drivers/staging/sb105x/sb_pci_mp.c | 14 ++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 3a9c6bf6299b..d3632cc241c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8441bf5e063e03e5d307ffb32fd5f77e81c0d397 +refs/heads/master: c803dd48f0539cb6adcbbcf41c758502e1e102cb diff --git a/trunk/drivers/staging/sb105x/sb_mp_register.h b/trunk/drivers/staging/sb105x/sb_mp_register.h index 5480ae11368f..a2087f5b0d1a 100644 --- a/trunk/drivers/staging/sb105x/sb_mp_register.h +++ b/trunk/drivers/staging/sb105x/sb_mp_register.h @@ -45,7 +45,7 @@ #define IIR_RS232 0x00 /* RS232 type */ #define IIR_RS422 0x10 /* RS422 type */ #define IIR_RS485 0x20 /* RS485 type */ -#define IIR_UNKNOWN 0x30 /* unknown type */ +#define IIR_TYPE_MASK 0x30 /* Interrrupt Mask Register */ #define MP_OPTR_IMR0 0x0C /* port0 ~ port8 */ diff --git a/trunk/drivers/staging/sb105x/sb_pci_mp.c b/trunk/drivers/staging/sb105x/sb_pci_mp.c index c34ebff6bb04..3da44dff24bf 100644 --- a/trunk/drivers/staging/sb105x/sb_pci_mp.c +++ b/trunk/drivers/staging/sb105x/sb_pci_mp.c @@ -2851,18 +2851,12 @@ static void __init multi_init_ports(void) printk("IIR_RET = %x\n",b_ret); } - if(IIR_RS232 == (b_ret & IIR_RS232)) - { - mtpt->interface = RS232; - } - if(IIR_RS422 == (b_ret & IIR_RS422)) - { + /* default to RS232 */ + mtpt->interface = RS232; + if (IIR_RS422 == (b_ret & IIR_TYPE_MASK)) mtpt->interface = RS422PTP; - } - if(IIR_RS485 == (b_ret & IIR_RS485)) - { + if (IIR_RS485 == (b_ret & IIR_TYPE_MASK)) mtpt->interface = RS485NE; - } } } }