FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpp: fix chip/ports numbers sanity test

Browse Source 
The test originally did not check any input from the hardware.
Fix it to check the actual (and proper) input from the hardware.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
This commit is contained in:
Tzafrir Cohen
2017-03-27 11:32:58 +03:00
parent 55775ab0d2
commit c05ad2200f
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/dahdi/xpp/card_bri.c
View File

@@ -693,8 +693,16 @@ static xpd_t *BRI_card_new(xbus_t *xbus, int unit, int subunit,
xpd_t *xpd = NULL;
int channels = min(3, CHANNELS_PERXPD);
if (unit_descriptor->ports_per_chip != 1) {
XBUS_ERR(xbus, "Bad subunit_ports=%d\n", unit_descriptor->ports_per_chip);
if ((unit_descriptor->ports_per_chip < 1) ||
(unit_descriptor->ports_per_chip > 4)) {
XBUS_ERR(xbus, "Bad ports_per_chip=%d\n",
unit_descriptor->ports_per_chip);
return NULL;
}
if ((unit_descriptor->numchips) < 1 ||
(unit_descriptor->numchips > 2)) {
XBUS_ERR(xbus, "Bad numchips=%d\n",
unit_descriptor->numchips);
return NULL;
}
XBUS_DBG(GENERAL, xbus, "\n");

11
drivers/dahdi/xpp/card_pri.c
View File

@@ -1264,8 +1264,15 @@ static xpd_t *PRI_card_new(xbus_t *xbus, int unit, int subunit,
struct PRI_priv_data *priv;
int channels = min(31, CHANNELS_PERXPD); /* worst case */
if (unit_descriptor->ports_per_chip != 1) {
XBUS_ERR(xbus, "Bad subunit_ports=%d\n", unit_descriptor->ports_per_chip);
if ((unit_descriptor->ports_per_chip < 1) ||
(unit_descriptor->ports_per_chip > 4)) {
XBUS_ERR(xbus, "Bad ports_per_chip=%d\n",
unit_descriptor->ports_per_chip);
return NULL;
}
if (unit_descriptor->numchips != 1) {
XBUS_ERR(xbus, "Bad numchips=%d\n",
unit_descriptor->numchips);
return NULL;
}
XBUS_DBG(GENERAL, xbus, "\n");