GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 06:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6

Browse source 
* 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
  Fix small typo
  misdn: indentation and braces disagree - add braces
  misdn: one handmade ARRAY_SIZE converted
  drivers/isdn/hardware/mISDN: move a dereference below a NULL test
  indentation & braces disagree - add braces
  Make parameter debug writable
  BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered
This commit is contained in:
Linus Torvalds 2009-01-12 15:57:34 -08:00
commit ddb4a9dd6a
5 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/isdn/hardware/mISDN/hfcmulti.c
View file

@ -3615,7 +3615,7 @@ hfcm_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
static void static void
ph_state_change(struct dchannel *dch) ph_state_change(struct dchannel *dch)
{ {
struct hfc_multi *hc = dch->hw; struct hfc_multi *hc;
int ch, i; int ch, i;
if (!dch) { if (!dch) {
@ -3623,6 +3623,7 @@ ph_state_change(struct dchannel *dch)
__func__); __func__);
return; return;
} }
hc = dch->hw;
ch = dch->slot; ch = dch->slot;
if (hc->type == 1) { if (hc->type == 1) {

2
drivers/isdn/hardware/mISDN/hfcpci.c
View file

@ -61,7 +61,7 @@ u32 hfc_jiffies;
MODULE_AUTHOR("Karsten Keil"); MODULE_AUTHOR("Karsten Keil");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(debug, uint, 0); module_param(debug, uint, S_IRUGO | S_IWUSR);
module_param(poll, uint, S_IRUGO | S_IWUSR); module_param(poll, uint, S_IRUGO | S_IWUSR);
enum { enum {

5
drivers/isdn/mISDN/dsp_cmx.c
View file

@ -1579,7 +1579,7 @@ send_packet:
schedule_work(&dsp->workq); schedule_work(&dsp->workq);
} }
static u32 jittercount; /* counter for jitter check */; static u32 jittercount; /* counter for jitter check */
struct timer_list dsp_spl_tl; struct timer_list dsp_spl_tl;
u32 dsp_spl_jiffies; /* calculate the next time to fire */ u32 dsp_spl_jiffies; /* calculate the next time to fire */
static u16 dsp_count; /* last sample count */ static u16 dsp_count; /* last sample count */
@ -1893,7 +1893,7 @@ dsp_cmx_hdlc(struct dsp *dsp, struct sk_buff *skb)
/* in case of hardware (echo) */ /* in case of hardware (echo) */
if (dsp->pcm_slot_tx >= 0) if (dsp->pcm_slot_tx >= 0)
return; return;
if (dsp->echo) if (dsp->echo) {
nskb = skb_clone(skb, GFP_ATOMIC); nskb = skb_clone(skb, GFP_ATOMIC);
if (nskb) { if (nskb) {
hh = mISDN_HEAD_P(nskb); hh = mISDN_HEAD_P(nskb);
@ -1902,6 +1902,7 @@ dsp_cmx_hdlc(struct dsp *dsp, struct sk_buff *skb)
skb_queue_tail(&dsp->sendq, nskb); skb_queue_tail(&dsp->sendq, nskb);
schedule_work(&dsp->workq); schedule_work(&dsp->workq);
} }
}
return; return;
} }
/* in case of hardware conference */ /* in case of hardware conference */

4
drivers/isdn/mISDN/dsp_pipeline.c
View file

@ -110,8 +110,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
} }
list_add_tail(&entry->list, &dsp_elements); list_add_tail(&entry->list, &dsp_elements);
for (i = 0; i < (sizeof(element_attributes) for (i = 0; i < ARRAY_SIZE(element_attributes); ++i) {
/ sizeof(struct device_attribute)); ++i)
ret = device_create_file(&entry->dev, ret = device_create_file(&entry->dev,
&element_attributes[i]); &element_attributes[i]);
if (ret) { if (ret) {
@ -119,6 +118,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
__func__); __func__);
goto err2; goto err2;
} }
}
#ifdef PIPELINE_DEBUG #ifdef PIPELINE_DEBUG
printk(KERN_DEBUG "%s: %s registered\n", __func__, elem->name); printk(KERN_DEBUG "%s: %s registered\n", __func__, elem->name);

3
include/linux/mISDNif.h
View file

@ -559,7 +559,10 @@ extern void mISDN_unregister_clock(struct mISDNclock *);
static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) static inline struct mISDNdevice *dev_to_mISDN(struct device *dev)
{ {
if (dev)
return dev_get_drvdata(dev); return dev_get_drvdata(dev);
else
return NULL;
} }
extern void set_channel_address(struct mISDNchannel *, u_int, u_int); extern void set_channel_address(struct mISDNchannel *, u_int, u_int);