diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/misc/c2port | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/misc/c2port')
| -rw-r--r-- | drivers/misc/c2port/c2port-duramar2150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/c2port/c2port-duramar2150.c b/drivers/misc/c2port/c2port-duramar2150.c index 338dcc121507..778fc3fdfb9b 100644 --- a/drivers/misc/c2port/c2port-duramar2150.c +++ b/drivers/misc/c2port/c2port-duramar2150.c | |||
| @@ -41,7 +41,7 @@ static void duramar2150_c2port_access(struct c2port_device *dev, int status) | |||
| 41 | outb(v | (C2D | C2CK), DIR_PORT); | 41 | outb(v | (C2D | C2CK), DIR_PORT); |
| 42 | else | 42 | else |
| 43 | /* When access is "off" is important that both lines are set | 43 | /* When access is "off" is important that both lines are set |
| 44 | * as inputs or hi-impedence */ | 44 | * as inputs or hi-impedance */ |
| 45 | outb(v & ~(C2D | C2CK), DIR_PORT); | 45 | outb(v & ~(C2D | C2CK), DIR_PORT); |
| 46 | 46 | ||
| 47 | mutex_unlock(&update_lock); | 47 | mutex_unlock(&update_lock); |