diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /arch/arm/mach-pxa/ssp.c | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'arch/arm/mach-pxa/ssp.c')
| -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) | |||
| 330 | 330 | ||
| 331 | mutex_unlock(&ssp_lock); | 331 | mutex_unlock(&ssp_lock); |
| 332 | 332 | ||
| 333 | if (ssp->port_id != port) | 333 | if (&ssp->node == &ssp_list) |
| 334 | return NULL; | 334 | return NULL; |
| 335 | 335 | ||
| 336 | return ssp; | 336 | return ssp; |