projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[deliverable/linux.git]
/
drivers
/
tty
/
n_gsm.c
diff --git
a/drivers/tty/n_gsm.c
b/drivers/tty/n_gsm.c
index 81b46585edf797561828f2adfac2e598543690f3..c5f8e5bda2b29c4606f3245ba9388f943d3f2147 100644
(file)
--- a/
drivers/tty/n_gsm.c
+++ b/
drivers/tty/n_gsm.c
@@
-716,8
+716,8
@@
static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
if (msg->len < 128)
*--dp = (msg->len << 1) | EA;
else {
if (msg->len < 128)
*--dp = (msg->len << 1) | EA;
else {
- *--dp = (
(msg->len & 127) << 1) | EA;
- *--dp = (msg->len
>> 6) & 0xfe;
+ *--dp = (
msg->len >> 7); /* bits 7 - 15 */
+ *--dp = (msg->len
& 127) << 1; /* bits 0 - 6 */
}
}
}
}
@@
-968,6
+968,8
@@
static void gsm_control_reply(struct gsm_mux *gsm, int cmd, u8 *data,
{
struct gsm_msg *msg;
msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->ftype);
{
struct gsm_msg *msg;
msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->ftype);
+ if (msg == NULL)
+ return;
msg->data[0] = (cmd & 0xFE) << 1 | EA; /* Clear C/R */
msg->data[1] = (dlen << 1) | EA;
memcpy(msg->data + 2, data, dlen);
msg->data[0] = (cmd & 0xFE) << 1 | EA; /* Clear C/R */
msg->data[1] = (dlen << 1) | EA;
memcpy(msg->data + 2, data, dlen);
This page took
0.025714 seconds
and
5
git commands to generate.