diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-08-12 04:49:47 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-08-12 04:49:47 +0000 |
| commit | 47f758cd53b42eccdaeb008ff389ac6ef6c210b8 (patch) | |
| tree | 1270073903fa476aa58a8bf563f172ab845413b2 /drivers/dahdi/xpp/xpp_dahdi.c | |
| parent | 6b3a831d45d90d9a363a82bd79cafe48bea177e5 (diff) | |
xpp: Don't check for the 'owner' field too soon
The owner field should only tested after the low-level driver
pre-registration method is called.
xpp rev: 7287
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6967 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xpp_dahdi.c')
| -rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index a6f7cc8..9be1e4d 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -1056,7 +1056,6 @@ int dahdi_register_xpd(xpd_t *xpd) const xops_t *xops; BUG_ON(!xpd); - WARN_ON(!xpd->span.owner); xops = xpd->xops; xbus = xpd->xbus; @@ -1129,6 +1128,10 @@ int dahdi_register_xpd(xpd_t *xpd) xbus->num, xpd->addr.unit, xpd->addr.subunit, xpd->type_name); XPD_DBG(GENERAL, xpd, "Registering span '%s'\n", xpd->span.desc); xpd->xops->card_dahdi_preregistration(xpd, 1); + if(!xpd->span.owner) { + XPD_ERR(xpd, "NO span.owner field -- bug in low-level driver\n"); + WARN_ON(!xpd->span.owner); + } if(dahdi_register(&xpd->span, prefmaster)) { XPD_ERR(xpd, "Failed to dahdi_register span\n"); return -ENODEV; |