5 files changed, 12 insertions, 7 deletions

diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 97f4708b3879..595ba8eb4a07 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -3615,7 +3615,7 @@ hfcm_bctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
 static void
 ph_state_change(struct dchannel *dch)
 {
-        struct hfc_multi *hc = dch->hw;
+        struct hfc_multi *hc;
         int ch, i;
 
         if (!dch) {
@@ -3623,6 +3623,7 @@ ph_state_change(struct dchannel *dch)
                     __func__);
                 return;
         }
+        hc = dch->hw;
         ch = dch->slot;
 
         if (hc->type == 1) {
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 917bf41a293b..f0e14dfcf71d 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -61,7 +61,7 @@ u32	hfc_jiffies;
 
 MODULE_AUTHOR("Karsten Keil");
 MODULE_LICENSE("GPL");
-module_param(debug, uint, 0);
+module_param(debug, uint, S_IRUGO | S_IWUSR);
 module_param(poll, uint, S_IRUGO | S_IWUSR);
 
 enum {
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 0ac67bff303a..58c43e429f73 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -1579,7 +1579,7 @@ send_packet:
         schedule_work(&dsp->workq);
 }
 
-static u32      jittercount; /* counter for jitter check */;
+static u32      jittercount; /* counter for jitter check */
 struct timer_list dsp_spl_tl;
 u32     dsp_spl_jiffies; /* calculate the next time to fire */
 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) */
                 if (dsp->pcm_slot_tx >= 0)
                         return;
-                if (dsp->echo)
+                if (dsp->echo) {
                         nskb = skb_clone(skb, GFP_ATOMIC);
                         if (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);
                                 schedule_work(&dsp->workq);
                         }
+                }
                 return;
         }
         /* in case of hardware conference */
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index bf999bdc41c3..18cf87c113e7 100644
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -110,8 +110,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
         }
         list_add_tail(&entry->list, &dsp_elements);
 
-        for (i = 0; i < (sizeof(element_attributes)
-                / sizeof(struct device_attribute)); ++i)
+        for (i = 0; i < ARRAY_SIZE(element_attributes); ++i) {
                 ret = device_create_file(&entry->dev,
                                 &element_attributes[i]);
                 if (ret) {
@@ -119,6 +118,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
                                 __func__);
                         goto err2;
                 }
+        }
 
 #ifdef PIPELINE_DEBUG
         printk(KERN_DEBUG "%s: %s registered\n", __func__, elem->name);
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 557477ac3d5b..5da3d95b27f1 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -559,7 +559,10 @@ extern void	mISDN_unregister_clock(struct mISDNclock *);
 
 static inline struct mISDNdevice *dev_to_mISDN(struct device *dev)
 {
-        return dev_get_drvdata(dev);
+        if (dev)
+                return dev_get_drvdata(dev);
+        else
+                return NULL;
 }
 
 extern void     set_channel_address(struct mISDNchannel *, u_int, u_int);