diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
| commit | 2cd1176bd9e92924242e779dcc5c8fc922f96659 (patch) | |
| tree | e9daa254647af2e7d9f99694e19976df0ea2a14d /drivers/misc/cs5535-mfgpt.c | |
| parent | a18711120764dd96ed2ee6a4d436c448542bad77 (diff) | |
| parent | e92d03bff9a0d0bcbb812c9b1290ca96c9338d45 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/misc/cs5535-mfgpt.c')
| -rw-r--r-- | drivers/misc/cs5535-mfgpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c index e01e08c8c88b..bc685bfc4c33 100644 --- a/drivers/misc/cs5535-mfgpt.c +++ b/drivers/misc/cs5535-mfgpt.c | |||
| @@ -174,7 +174,7 @@ struct cs5535_mfgpt_timer *cs5535_mfgpt_alloc_timer(int timer_nr, int domain) | |||
| 174 | timer_nr = t < max ? (int) t : -1; | 174 | timer_nr = t < max ? (int) t : -1; |
| 175 | } else { | 175 | } else { |
| 176 | /* check if the requested timer's available */ | 176 | /* check if the requested timer's available */ |
| 177 | if (test_bit(timer_nr, mfgpt->avail)) | 177 | if (!test_bit(timer_nr, mfgpt->avail)) |
| 178 | timer_nr = -1; | 178 | timer_nr = -1; |
| 179 | } | 179 | } |
| 180 | 180 | ||