diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 08:13:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 08:13:35 -0800 |
| commit | adf9904dc774f23f04a5425f0198483ea61f878b (patch) | |
| tree | dfe0527c7f3877eb4d155ddb20fd303c1d8328c0 /drivers/parport | |
| parent | bb592cf474404e51cbf3c419fb72fda83c4b7d72 (diff) | |
| parent | 49966bae8446f5ba7e8afbd01bde82af4e00628a (diff) | |
| download | linux-adf9904dc774f23f04a5425f0198483ea61f878b.tar.gz linux-adf9904dc774f23f04a5425f0198483ea61f878b.tar.bz2 linux-adf9904dc774f23f04a5425f0198483ea61f878b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: parport_mfc3 - Not makes it a bool before the comparison.
m68k: don't export static inline functions
fbdev: atafb - add palette register check
m68k: Remove the BKL from sys_execve
m68k: Cleanup linker scripts using new linker script macros.
m68k: Make thread_info.h usable from assembly.
m68knommu: define arch_has_single_step() and friends
m68k: ptrace fixes
m68k: use generic code for ptrace requests
rtc: Add an RTC driver for the Ricoh RP5C01
rtc: Add an RTC driver for the Oki MSM6242
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/parport_mfc3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c index 6dec9ba5ed28..362db31d8ca6 100644 --- a/drivers/parport/parport_mfc3.c +++ b/drivers/parport/parport_mfc3.c @@ -386,7 +386,7 @@ static void __exit parport_mfc3_exit(void) if (!this_port[i]) continue; parport_remove_port(this_port[i]); - if (!this_port[i]->irq != PARPORT_IRQ_NONE) { + if (this_port[i]->irq != PARPORT_IRQ_NONE) { if (--use_cnt == 0) free_irq(IRQ_AMIGA_PORTS, &pp_mfc3_ops); } |