diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-12 19:37:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-12 19:37:29 -0700 |
| commit | 61d6cc54896811086b51fa78d440311974a09b3a (patch) | |
| tree | d02625ab046151ff915d30248093c6cf44c64066 /arch | |
| parent | c6d8f400cc7610f04177f81168c19b8407cb48c3 (diff) | |
| parent | 3692fd0aaef489b063518b5999c702bada5b6e22 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5091/1: Add missing bitfield include to regs-lcd.h
[ARM] 5090/1: Correct pxafb palette typo error
[ARM] 5077/1: spi: fix list scan success verification in PXA ssp driver
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/ssp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 00af7f2fed66..0bb31982fb6f 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c @@ -330,7 +330,7 @@ struct ssp_device *ssp_request(int port, const char *label) mutex_unlock(&ssp_lock); - if (ssp->port_id != port) + if (&ssp->node == &ssp_list) return NULL; return ssp; |