From 28f639ca1fe0079a77bda9bb39daa67e1ac316ac Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sat, 6 Aug 2011 18:18:10 -0300 Subject: [PATCH] --- yaml --- r: 271877 b: refs/heads/master c: 0224e0401f0b18e1f5fce010558b12fc24257e37 h: refs/heads/master i: 271875: 0507ddf9da5c14a25175bff31f7db157be090623 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/ati_remote.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bd29b1d19d60..b6f5453c8df3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44fd0b600fbc21de9d771f0a5db79d24b321fce7 +refs/heads/master: 0224e0401f0b18e1f5fce010558b12fc24257e37 diff --git a/trunk/drivers/media/rc/ati_remote.c b/trunk/drivers/media/rc/ati_remote.c index 7a47d7e73b57..92f2b1bcef4a 100644 --- a/trunk/drivers/media/rc/ati_remote.c +++ b/trunk/drivers/media/rc/ati_remote.c @@ -273,9 +273,10 @@ static struct usb_driver ati_remote_driver = { static void ati_remote_dump(struct device *dev, unsigned char *data, unsigned int len) { - if ((len == 1) && (data[0] != (unsigned char)0xff) && (data[0] != 0x00)) - dev_warn(dev, "Weird byte 0x%02x\n", data[0]); - else if (len == 4) + if (len == 1) { + if (data[0] != (unsigned char)0xff && data[0] != 0x00) + dev_warn(dev, "Weird byte 0x%02x\n", data[0]); + } else if (len == 4) dev_warn(dev, "Weird key %02x %02x %02x %02x\n", data[0], data[1], data[2], data[3]); else