Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / media / usb / dvb-usb / dib0700_core.c

diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index 2679797..f319665 100644 (file)
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -710,7 +710,6 @@ static void dib0700_rc_urb_completion(struct urb *purb)
 
        switch (d->props.rc.core.protocol) {
        case RC_BIT_NEC:
-               protocol = RC_TYPE_NEC;
                toggle = 0;
 
                /* NEC protocol sends repeat code as 0 0 0 FF */
@@ -728,16 +727,19 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                                                     poll_reply->nec.not_system << 16 |
                                                     poll_reply->nec.data       << 8  |
                                                     poll_reply->nec.not_data);
+                       protocol = RC_TYPE_NEC32;
                } else if ((poll_reply->nec.system ^ poll_reply->nec.not_system) != 0xff) {
                        deb_data("NEC extended protocol\n");
                        keycode = RC_SCANCODE_NECX(poll_reply->nec.system << 8 |
                                                    poll_reply->nec.not_system,
                                                    poll_reply->nec.data);
 
+                       protocol = RC_TYPE_NECX;
                } else {
                        deb_data("NEC normal protocol\n");
                        keycode = RC_SCANCODE_NEC(poll_reply->nec.system,
                                                   poll_reply->nec.data);
+                       protocol = RC_TYPE_NEC;
                }
 
                break;