diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 15:56:49 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 15:56:49 +0300 |
| commit | 32f35b863451884e856f0f577474740561a87fad (patch) | |
| tree | 2d1d55c7e2d23e27197bf84246c5f23070eb0fce /drivers/media/usb/pvrusb2/pvrusb2-encoder.c | |
| parent | ae7617f0ef1820be033eef93859a6bb6174a843f (diff) | |
| parent | 754270c7c56292e97d0eff924a5d5d83f92add07 (diff) | |
| download | talos-obmc-linux-32f35b863451884e856f0f577474740561a87fad.tar.gz talos-obmc-linux-32f35b863451884e856f0f577474740561a87fad.zip | |
Merge drm-upstream/drm-next into drm-intel-next-queued
Need MST sideband message transaction to power up/down nodes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/media/usb/pvrusb2/pvrusb2-encoder.c')
| -rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-encoder.c b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c index ca637074fa1f..43e43404095f 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-encoder.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c @@ -198,7 +198,7 @@ static int pvr2_encoder_cmd(void *ctxt, } - LOCK_TAKE(hdw->ctl_lock); do { + LOCK_TAKE(hdw->ctl_lock); while (1) { if (!hdw->state_encoder_ok) { ret = -EIO; @@ -293,9 +293,9 @@ rdData[0]); wrData[0] = 0x0; ret = pvr2_encoder_write_words(hdw,MBOX_BASE,wrData,1); - if (ret) break; + break; - } while(0); LOCK_GIVE(hdw->ctl_lock); + }; LOCK_GIVE(hdw->ctl_lock); return ret; } |
