diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-23 14:31:03 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-28 07:20:46 +0100 |
| commit | 6aa7f8ef293f27215f685b2f94e980c7f3a337d5 (patch) | |
| tree | d3e97a1ce1c24516d5c691e7d0ca6e7d30f4bfe6 /sound/usb/line6 | |
| parent | ALSA: line6: Fix missing error handling in line6_pcm_acquire() (diff) | |
| download | linux-6aa7f8ef293f27215f685b2f94e980c7f3a337d5.tar.xz linux-6aa7f8ef293f27215f685b2f94e980c7f3a337d5.zip | |
ALSA: line6: Use logical OR
Fixed a few places using bits OR wrongly for condition checks.
Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6')
| -rw-r--r-- | sound/usb/line6/pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 826158fe9149..f740b4490d75 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -131,7 +131,7 @@ int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int channels) a bug, we therefore report an error if capturing is restarted too soon. */ - if (line6pcm->active_urb_in | line6pcm->unlink_urb_in) { + if (line6pcm->active_urb_in || line6pcm->unlink_urb_in) { dev_err(line6pcm->line6->ifcdev, "Device not yet ready\n"); err = -EBUSY; goto pcm_acquire_error; @@ -166,7 +166,7 @@ int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int channels) /* See comment above regarding PCM restart. */ - if (line6pcm->active_urb_out | line6pcm->unlink_urb_out) { + if (line6pcm->active_urb_out || line6pcm->unlink_urb_out) { dev_err(line6pcm->line6->ifcdev, "Device not yet ready\n"); return -EBUSY; } |