summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-06-13 09:48:29 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-06-13 09:48:29 +1000
commit0c790dfce82fdae52b6077df23ee72360adb5d60 (patch)
tree90422fde12828c0a27d98a524c3742e043c09516 /arch
parent5bcef204b19ed2659856acbc1a4dfe4c8da3b679 (diff)
parent3692fd0aaef489b063518b5999c702bada5b6e22 (diff)
Merge commit 'arm-current/master'
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/ssp.c2
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;