From 2ea65995de200e940dcb43ebd56d7c7ddc3dec66 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 27 Dec 2012 16:32:58 -0200 Subject: [PATCH] --- yaml --- r: 357187 b: refs/heads/master c: 9d5394c2a19f8a74cb55ce83027bad1808b373b5 h: refs/heads/master i: 357185: 0430f7069c06e059e3ee92ec7afc44bb1a7ac805 357183: f580142959c2e8aacd6e8c6613daf36c8a5d135e v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/dvb-usb/m920x.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 81de1af14c00..7f775533b9f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b677757cef208203426aa8486a91214809135e01 +refs/heads/master: 9d5394c2a19f8a74cb55ce83027bad1808b373b5 diff --git a/trunk/drivers/media/usb/dvb-usb/m920x.c b/trunk/drivers/media/usb/dvb-usb/m920x.c index bddd7637fdaa..a70c5eaf0600 100644 --- a/trunk/drivers/media/usb/dvb-usb/m920x.c +++ b/trunk/drivers/media/usb/dvb-usb/m920x.c @@ -191,10 +191,14 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state) if (!rc_state) return -ENOMEM; - if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, rc_state, 1)) != 0) + ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, + rc_state, 1); + if (ret != 0) goto out; - if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0) + ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, + rc_state + 1, 1); + if (ret != 0) goto out; m920x_parse_rc_state(d, rc_state[0], state);