diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-28 13:43:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-28 13:43:27 +1100 |
| commit | e12fdab4fb2bbe6e5283cfa201cf57994536d727 (patch) | |
| tree | 65bbba28c58d866ccd7f1e56b8d0457170dc9d15 /drivers/staging/msm/mddihost.c | |
| parent | 06c58c708f55d3d16709fbff5b60387f997c32ab (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
arch/arm/plat-omap/devices.c
drivers/misc/Makefile
drivers/misc/ti-st/st_core.c
drivers/misc/ti-st/st_kim.c
drivers/staging/Makefile
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-audio.h
drivers/staging/mrst-touchscreen/Makefile
drivers/staging/mrst-touchscreen/intel-mid-touch.c
drivers/staging/ti-st/st.h
drivers/staging/ti-st/st_core.h
fs/compat_ioctl.c
Diffstat (limited to 'drivers/staging/msm/mddihost.c')
| -rw-r--r-- | drivers/staging/msm/mddihost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/msm/mddihost.c b/drivers/staging/msm/mddihost.c index c6c1ee4eda05..58a86d5d995f 100644 --- a/drivers/staging/msm/mddihost.c +++ b/drivers/staging/msm/mddihost.c @@ -67,7 +67,7 @@ void mddi_init(void) mddi_host_initialized = TRUE; - init_MUTEX(&mddi_host_mutex); + sema_init(&mddi_host_mutex, 1); if (!mddi_host_powered) { down(&mddi_host_mutex); |