projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
isdn
/
i4l
/
isdn_ppp.c
diff --git
a/drivers/isdn/i4l/isdn_ppp.c
b/drivers/isdn/i4l/isdn_ppp.c
index
4381179
..
1726131
100644
(file)
--- a/
drivers/isdn/i4l/isdn_ppp.c
+++ b/
drivers/isdn/i4l/isdn_ppp.c
@@
-717,7
+717,7
@@
isdn_ppp_fill_rq(unsigned char *buf, int len, int proto, int slot)
printk(KERN_DEBUG "ippp: device not activated.\n");
return 0;
}
- nbuf =
(unsigned char *)
kmalloc(len + 4, GFP_ATOMIC);
+ nbuf = kmalloc(len + 4, GFP_ATOMIC);
if (!nbuf) {
printk(KERN_WARNING "ippp: Can't alloc buf\n");
return 0;