aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hamradio
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r--drivers/net/hamradio/bpqether.c5
-rw-r--r--drivers/net/hamradio/dmascc.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 76abed9a70b..ae5f11c8fc1 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -167,10 +167,7 @@ static inline struct net_device *bpq_get_ax25_dev(struct net_device *dev)
167 167
168static inline int dev_is_ethdev(struct net_device *dev) 168static inline int dev_is_ethdev(struct net_device *dev)
169{ 169{
170 return ( 170 return (dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5));
171 dev->type == ARPHRD_ETHER
172 && strncmp(dev->name, "dummy", 5)
173 );
174} 171}
175 172
176/* ------------------------------------------------------------------------ */ 173/* ------------------------------------------------------------------------ */
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 950f3bb21f9..9ee76b42668 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -331,8 +331,8 @@ static int __init dmascc_init(void)
331 for (i = 0; i < MAX_NUM_DEVS && io[i]; i++) { 331 for (i = 0; i < MAX_NUM_DEVS && io[i]; i++) {
332 j = (io[i] - 332 j = (io[i] -
333 hw[h].io_region) / hw[h].io_delta; 333 hw[h].io_region) / hw[h].io_delta;
334 if (j >= 0 && j < hw[h].num_devs 334 if (j >= 0 && j < hw[h].num_devs &&
335 && hw[h].io_region + 335 hw[h].io_region +
336 j * hw[h].io_delta == io[i]) { 336 j * hw[h].io_delta == io[i]) {
337 base[j] = io[i]; 337 base[j] = io[i];
338 } 338 }
@@ -396,8 +396,8 @@ static int __init dmascc_init(void)
396 t_val = 396 t_val =
397 inb(t1[i]) + (inb(t1[i]) << 8); 397 inb(t1[i]) + (inb(t1[i]) << 8);
398 /* Also check whether counter did wrap */ 398 /* Also check whether counter did wrap */
399 if (t_val == 0 399 if (t_val == 0 ||
400 || t_val > TMR_0_HZ / HZ * 10) 400 t_val > TMR_0_HZ / HZ * 10)
401 counting[i] = 0; 401 counting[i] = 0;
402 delay[i] = jiffies - start[i]; 402 delay[i] = jiffies - start[i];
403 } 403 }