Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141223
b: refs/heads/master
c: 387ed8f
h: refs/heads/master
i:
  141221: e1485d3
  141219: 50f9cfd
  141215: 3c1a5fe
v: v3
  • Loading branch information
Andre Haupt authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 780157c commit b355fb2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07d2a2823014927e3578377a07868400837a79c6
refs/heads/master: 387ed8f8ed047b7a70578767c4bc9d86a82312bf
6 changes: 3 additions & 3 deletions trunk/drivers/staging/me4000/me4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,12 @@ static irqreturn_t me4000_ext_int_isr(int, void *);

static int inline me4000_buf_count(struct me4000_circ_buf buf, int size)
{
return ((buf.head - buf.tail) & (size - 1));
return (buf.head - buf.tail) & (size - 1);
}

static int inline me4000_buf_space(struct me4000_circ_buf buf, int size)
{
return ((buf.tail - (buf.head + 1)) & (size - 1));
return (buf.tail - (buf.head + 1)) & (size - 1);
}

static int inline me4000_values_to_end(struct me4000_circ_buf buf, int size)
Expand Down Expand Up @@ -2058,7 +2058,7 @@ static ssize_t me4000_ao_write_cont(struct file *filep, const char *buff,
ME4000_AO_BUFFER_COUNT);

if (c == 0)
return (2 * ret);
return 2 * ret;

/* Only able to write size of free buffer or size of count */
if (count < c)
Expand Down

0 comments on commit b355fb2

Please sign in to comment.