diff options
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcpci.c | 4 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_pipeline.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 8df12bf02af3..2db06490b1ac 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c | |||
@@ -2333,10 +2333,10 @@ HFC_init(void) | |||
2333 | poll = HFCPCI_BTRANS_THRESHOLD; | 2333 | poll = HFCPCI_BTRANS_THRESHOLD; |
2334 | 2334 | ||
2335 | if (poll != HFCPCI_BTRANS_THRESHOLD) { | 2335 | if (poll != HFCPCI_BTRANS_THRESHOLD) { |
2336 | tics = poll * HZ / 8000; | 2336 | tics = (poll * HZ) / 8000; |
2337 | if (tics < 1) | 2337 | if (tics < 1) |
2338 | tics = 1; | 2338 | tics = 1; |
2339 | poll = tics * 8000 / HZ; | 2339 | poll = (tics * 8000) / HZ; |
2340 | if (poll > 256 || poll < 8) { | 2340 | if (poll > 256 || poll < 8) { |
2341 | printk(KERN_ERR "%s: Wrong poll value %d not in range " | 2341 | printk(KERN_ERR "%s: Wrong poll value %d not in range " |
2342 | "of 8..256.\n", __func__, poll); | 2342 | "of 8..256.\n", __func__, poll); |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index c16cb7ac3d2a..7e60cb94b5c0 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -1141,7 +1141,7 @@ static int dsp_init(void) | |||
1141 | } else { | 1141 | } else { |
1142 | poll = 8; | 1142 | poll = 8; |
1143 | while (poll <= MAX_POLL) { | 1143 | while (poll <= MAX_POLL) { |
1144 | tics = poll * HZ / 8000; | 1144 | tics = (poll * HZ) / 8000; |
1145 | if (tics * 8000 == poll * HZ) { | 1145 | if (tics * 8000 == poll * HZ) { |
1146 | dsp_tics = tics; | 1146 | dsp_tics = tics; |
1147 | dsp_poll = poll; | 1147 | dsp_poll = poll; |
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index 7a3a3e1e4d80..bf999bdc41c3 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c | |||
@@ -92,7 +92,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem) | |||
92 | if (!elem) | 92 | if (!elem) |
93 | return -EINVAL; | 93 | return -EINVAL; |
94 | 94 | ||
95 | entry = kzalloc(sizeof(struct dsp_element_entry), GFP_KERNEL); | 95 | entry = kzalloc(sizeof(struct dsp_element_entry), GFP_ATOMIC); |
96 | if (!entry) | 96 | if (!entry) |
97 | return -ENOMEM; | 97 | return -ENOMEM; |
98 | 98 | ||
@@ -253,7 +253,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg) | |||
253 | if (!len) | 253 | if (!len) |
254 | return 0; | 254 | return 0; |
255 | 255 | ||
256 | dup = kmalloc(len + 1, GFP_KERNEL); | 256 | dup = kmalloc(len + 1, GFP_ATOMIC); |
257 | if (!dup) | 257 | if (!dup) |
258 | return 0; | 258 | return 0; |
259 | strcpy(dup, cfg); | 259 | strcpy(dup, cfg); |
@@ -270,7 +270,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg) | |||
270 | elem = entry->elem; | 270 | elem = entry->elem; |
271 | 271 | ||
272 | pipeline_entry = kmalloc(sizeof(struct | 272 | pipeline_entry = kmalloc(sizeof(struct |
273 | dsp_pipeline_entry), GFP_KERNEL); | 273 | dsp_pipeline_entry), GFP_ATOMIC); |
274 | if (!pipeline_entry) { | 274 | if (!pipeline_entry) { |
275 | printk(KERN_ERR "%s: failed to add " | 275 | printk(KERN_ERR "%s: failed to add " |
276 | "entry to pipeline: %s (out of " | 276 | "entry to pipeline: %s (out of " |