diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/atm/eni.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'drivers/atm/eni.c')
| -rw-r--r-- | drivers/atm/eni.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index 41b2204ebc6e..5503bfc8e132 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c | |||
| @@ -1270,7 +1270,7 @@ static int comp_tx(struct eni_dev *eni_dev,int *pcr,int reserved,int *pre, | |||
| 1270 | if (*pre < 3) (*pre)++; /* else fail later */ | 1270 | if (*pre < 3) (*pre)++; /* else fail later */ |
| 1271 | div = pre_div[*pre]*-*pcr; | 1271 | div = pre_div[*pre]*-*pcr; |
| 1272 | DPRINTK("max div %d\n",div); | 1272 | DPRINTK("max div %d\n",div); |
| 1273 | *res = (TS_CLOCK+div-1)/div-1; | 1273 | *res = DIV_ROUND_UP(TS_CLOCK, div)-1; |
| 1274 | } | 1274 | } |
| 1275 | if (*res < 0) *res = 0; | 1275 | if (*res < 0) *res = 0; |
| 1276 | if (*res > MID_SEG_MAX_RATE) *res = MID_SEG_MAX_RATE; | 1276 | if (*res > MID_SEG_MAX_RATE) *res = MID_SEG_MAX_RATE; |