git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'parisc-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[sfrench/cifs-2.6.git]
/
drivers
/
isdn
/
hardware
/
mISDN
/
hfcsusb.c
diff --git
a/drivers/isdn/hardware/mISDN/hfcsusb.c
b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 124ff530da82ae2edae23de0f45e57456a16eca0..26e3182bbca87a0f25b13b86fde05bb73518b292 100644
(file)
--- a/
drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/
drivers/isdn/hardware/mISDN/hfcsusb.c
@@
-263,6
+263,9
@@
hfcsusb_ph_info(struct hfcsusb *hw)
int i;
phi = kzalloc(struct_size(phi, bch, dch->dev.nrbchan), GFP_ATOMIC);
+ if (!phi)
+ return;
+
phi->dch.ch.protocol = hw->protocol;
phi->dch.ch.Flags = dch->Flags;
phi->dch.state = dch->state;