Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0224e040 authored by Anssi Hannula's avatar Anssi Hannula Committed by Mauro Carvalho Chehab
Browse files

[media] ati_remote: fix check for a weird byte 



The ati_remote_dump() function tries to not print "Weird byte" warning
for 1-byte responses that contain 0xff or 0x00, but it doesn't work
properly as it simply falls back to the "Weird data" warning in the else
clause.

Fix that by adding an inner if clause.

Signed-off-by: default avatarAnssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 44fd0b60

drivers/media/rc/ati_remote.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -273,9 +273,10 @@ static struct usb_driver ati_remote_driver = { 
static void ati_remote_dump(struct device *dev, unsigned char *data,

static void ati_remote_dump(struct device *dev, unsigned char *data,

			    unsigned int len)

			    unsigned int len)

{

{

	if ((len == 1) && (data[0] != (unsigned char)0xff) && (data[0] != 0x00))

	if (len == 1) {

		if (data[0] != (unsigned char)0xff && data[0] != 0x00)

			dev_warn(dev, "Weird byte 0x%02x\n", data[0]);

			dev_warn(dev, "Weird byte 0x%02x\n", data[0]);

	else if (len == 4)

	} else if (len == 4)

		dev_warn(dev, "Weird key %02x %02x %02x %02x\n",

		dev_warn(dev, "Weird key %02x %02x %02x %02x\n",

		     data[0], data[1], data[2], data[3]);

		     data[0], data[1], data[2], data[3]);

	else

	else