diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-05-19 16:01:27 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-05-19 16:01:27 +0000 |
| commit | 307fc61247e696b18d84d7fd59f6576b1aca9cec (patch) | |
| tree | 3d261aa38176c64607e5de564ee778d3815bc499 /drivers/dahdi/xpp/xbus-sysfs.c | |
| parent | bc110fe9b114b8e3b99f068ad9b3aac6466ee63d (diff) | |
xpp: fix the Astribank state machine
This generally is a case that would not happen in the wild, though.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6641 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xbus-sysfs.c')
| -rw-r--r-- | drivers/dahdi/xpp/xbus-sysfs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index 63bce35..7f570ea 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -86,7 +86,7 @@ static DEVICE_ATTR_WRITER(xbus_state_store, dev, buf, count) xbus = dev_to_xbus(dev); XBUS_DBG(GENERAL, xbus, "%s\n", buf); if(strncmp(buf, "stop", 4) == 0) - xbus_deactivate(xbus, 0); + xbus_deactivate(xbus); else if(XBUS_IS(xbus, IDLE) && strncmp(buf, "start", 5) == 0) xbus_activate(xbus); else { @@ -104,7 +104,7 @@ static DEVICE_ATTR_READER(status_show, dev, buf) int ret; xbus = dev_to_xbus(dev); - ret = snprintf(buf, PAGE_SIZE, "%s\n", (!XBUS_IS(xbus, DISCONNECTED))?"connected":"missing"); + ret = snprintf(buf, PAGE_SIZE, "%s\n", (XBUS_FLAGS(xbus, CONNECTED))?"connected":"missing"); return ret; } @@ -392,7 +392,11 @@ static void astribank_release(struct device *dev) BUG_ON(!dev); xbus = dev_to_xbus(dev); - if(!XBUS_IS(xbus, DISCONNECTED)) { + if(XBUS_FLAGS(xbus, CONNECTED)) { + XBUS_ERR(xbus, "Try to release CONNECTED device.\n"); + BUG(); + } + if(!XBUS_IS(xbus, IDLE) && !XBUS_IS(xbus, FAIL) && !XBUS_IS(xbus, DEACTIVATED)) { XBUS_ERR(xbus, "Try to release in state %s\n", xbus_statename(XBUS_STATE(xbus))); BUG(); |