diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /drivers/atm/firestream.c | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'drivers/atm/firestream.c')
| -rw-r--r-- | drivers/atm/firestream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 697ad82f6634..9c67df5ccfa4 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
| @@ -512,7 +512,7 @@ static unsigned int make_rate (unsigned int rate, int r, | |||
| 512 | } | 512 | } |
| 513 | case ROUND_UP: { | 513 | case ROUND_UP: { |
| 514 | /* check all bits that we are discarding */ | 514 | /* check all bits that we are discarding */ |
| 515 | if (man & (-1>>9)) { | 515 | if (man & (~0U>>9)) { |
| 516 | man = (man>>(32-9)) + 1; | 516 | man = (man>>(32-9)) + 1; |
| 517 | if (man == (1<<9)) { | 517 | if (man == (1<<9)) { |
| 518 | /* no need to check for round up outside of range */ | 518 | /* no need to check for round up outside of range */ |