summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/isdn
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/isdn')
-rw-r--r--kernel/drivers/isdn/gigaset/ser-gigaset.c4
-rw-r--r--kernel/drivers/isdn/hardware/eicon/message.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/drivers/isdn/gigaset/ser-gigaset.c b/kernel/drivers/isdn/gigaset/ser-gigaset.c
index 2a506fe0c..74bf1a17a 100644
--- a/kernel/drivers/isdn/gigaset/ser-gigaset.c
+++ b/kernel/drivers/isdn/gigaset/ser-gigaset.c
@@ -762,8 +762,10 @@ static int __init ser_gigaset_init(void)
driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
GIGASET_MODULENAME, GIGASET_DEVNAME,
&ops, THIS_MODULE);
- if (!driver)
+ if (!driver) {
+ rc = -ENOMEM;
goto error;
+ }
rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc);
if (rc != 0) {
diff --git a/kernel/drivers/isdn/hardware/eicon/message.c b/kernel/drivers/isdn/hardware/eicon/message.c
index d7c286656..7b4ddf0a3 100644
--- a/kernel/drivers/isdn/hardware/eicon/message.c
+++ b/kernel/drivers/isdn/hardware/eicon/message.c
@@ -11304,7 +11304,8 @@ static void mixer_notify_update(PLCI *plci, byte others)
((CAPI_MSG *) msg)->header.ncci = 0;
((CAPI_MSG *) msg)->info.facility_req.Selector = SELECTOR_LINE_INTERCONNECT;
((CAPI_MSG *) msg)->info.facility_req.structs[0] = 3;
- PUT_WORD(&(((CAPI_MSG *) msg)->info.facility_req.structs[1]), LI_REQ_SILENT_UPDATE);
+ ((CAPI_MSG *) msg)->info.facility_req.structs[1] = LI_REQ_SILENT_UPDATE & 0xff;
+ ((CAPI_MSG *) msg)->info.facility_req.structs[2] = LI_REQ_SILENT_UPDATE >> 8;
((CAPI_MSG *) msg)->info.facility_req.structs[3] = 0;
w = api_put(notify_plci->appl, (CAPI_MSG *) msg);
if (w != _QUEUE_FULL)