diff options
Diffstat (limited to 'drivers/staging/dgrp')
| -rw-r--r-- | drivers/staging/dgrp/dgrp_dpa_ops.c | 2 | ||||
| -rw-r--r-- | drivers/staging/dgrp/dgrp_net_ops.c | 3 | ||||
| -rw-r--r-- | drivers/staging/dgrp/dgrp_sysfs.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/dgrp/dgrp_dpa_ops.c b/drivers/staging/dgrp/dgrp_dpa_ops.c index 49e6709..021cca4 100644 --- a/drivers/staging/dgrp/dgrp_dpa_ops.c +++ b/drivers/staging/dgrp/dgrp_dpa_ops.c @@ -387,7 +387,7 @@ static long dgrp_dpa_ioctl(struct file *file, unsigned int cmd, port = getchan.ch_port; - if (port < 0 || port > nd->nd_chan_count) + if (port > nd->nd_chan_count) return -EINVAL; ch = nd->nd_chan + port; diff --git a/drivers/staging/dgrp/dgrp_net_ops.c b/drivers/staging/dgrp/dgrp_net_ops.c index ab839ea..067d975 100644 --- a/drivers/staging/dgrp/dgrp_net_ops.c +++ b/drivers/staging/dgrp/dgrp_net_ops.c @@ -1671,6 +1671,9 @@ static int dgrp_send(struct nd_struct *nd, long tmax) * do the job. */ + /* FIXME: jiffies - ch->ch_waketime can never + be < 0. Someone needs to work out what is + actually intended here */ if (ch->ch_pun.un_open_count && (ch->ch_pun.un_flag & (UN_EMPTY|UN_TIME|UN_LOW|UN_PWAIT)) != 0) { diff --git a/drivers/staging/dgrp/dgrp_sysfs.c b/drivers/staging/dgrp/dgrp_sysfs.c index e5a3c88..129be3c 100644 --- a/drivers/staging/dgrp/dgrp_sysfs.c +++ b/drivers/staging/dgrp/dgrp_sysfs.c @@ -177,7 +177,7 @@ static ssize_t dgrp_node_description_show(struct device *c, if (!nd) return 0; - if (nd->nd_state == NS_READY && nd->nd_ps_desc) + if (nd->nd_state == NS_READY) return snprintf(buf, PAGE_SIZE, "%s\n", nd->nd_ps_desc); return 0; } |