diff options
Diffstat (limited to 'drivers/media/rc/imon.c')
-rw-r--r-- | drivers/media/rc/imon.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index eb37f2622364..ac05c364f663 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c | |||
@@ -1017,7 +1017,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type) | |||
1017 | unsigned char ir_proto_packet[] = { | 1017 | unsigned char ir_proto_packet[] = { |
1018 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 }; | 1018 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 }; |
1019 | 1019 | ||
1020 | if (*rc_type && !rc_protocols_allowed(rc, *rc_type)) | 1020 | if (*rc_type && !(*rc_type & rc->allowed_protocols)) |
1021 | dev_warn(dev, "Looks like you're trying to use an IR protocol " | 1021 | dev_warn(dev, "Looks like you're trying to use an IR protocol " |
1022 | "this device does not support\n"); | 1022 | "this device does not support\n"); |
1023 | 1023 | ||
@@ -1870,8 +1870,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx) | |||
1870 | 1870 | ||
1871 | rdev->priv = ictx; | 1871 | rdev->priv = ictx; |
1872 | rdev->driver_type = RC_DRIVER_SCANCODE; | 1872 | rdev->driver_type = RC_DRIVER_SCANCODE; |
1873 | /* iMON PAD or MCE */ | 1873 | rdev->allowed_protocols = RC_BIT_OTHER | RC_BIT_RC6_MCE; /* iMON PAD or MCE */ |
1874 | rc_set_allowed_protocols(rdev, RC_BIT_OTHER | RC_BIT_RC6_MCE); | ||
1875 | rdev->change_protocol = imon_ir_change_protocol; | 1874 | rdev->change_protocol = imon_ir_change_protocol; |
1876 | rdev->driver_name = MOD_NAME; | 1875 | rdev->driver_name = MOD_NAME; |
1877 | 1876 | ||
@@ -1884,7 +1883,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx) | |||
1884 | 1883 | ||
1885 | if (ictx->product == 0xffdc) { | 1884 | if (ictx->product == 0xffdc) { |
1886 | imon_get_ffdc_type(ictx); | 1885 | imon_get_ffdc_type(ictx); |
1887 | rc_set_allowed_protocols(rdev, ictx->rc_type); | 1886 | rdev->allowed_protocols = ictx->rc_type; |
1888 | } | 1887 | } |
1889 | 1888 | ||
1890 | imon_set_display_type(ictx); | 1889 | imon_set_display_type(ictx); |