From 4569d5ea8cf4da81fb8c13a99710506933f5145a Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Wed, 12 Sep 2012 20:23:52 -0300 Subject: [PATCH] --- yaml --- r: 331070 b: refs/heads/master c: e1e9e510bb8639ace59dcd1f8e6b5754dfbb9b44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/dvb-usb-v2/af9015.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5e52df529812..943e0adc8615 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e35c66f138c6a4f50da863a82983a541f1c2a24 +refs/heads/master: e1e9e510bb8639ace59dcd1f8e6b5754dfbb9b44 diff --git a/trunk/drivers/media/usb/dvb-usb-v2/af9015.c b/trunk/drivers/media/usb/dvb-usb-v2/af9015.c index a4be303edb4f..824f1911ee21 100644 --- a/trunk/drivers/media/usb/dvb-usb-v2/af9015.c +++ b/trunk/drivers/media/usb/dvb-usb-v2/af9015.c @@ -71,7 +71,7 @@ static int af9015_ctrl_msg(struct dvb_usb_device *d, struct req_t *req) default: dev_err(&d->udev->dev, "%s: unknown command=%d\n", KBUILD_MODNAME, req->cmd); - ret = -1; + ret = -EIO; goto error; } @@ -107,7 +107,7 @@ static int af9015_ctrl_msg(struct dvb_usb_device *d, struct req_t *req) if (rlen && buf[1]) { dev_err(&d->udev->dev, "%s: command failed=%d\n", KBUILD_MODNAME, buf[1]); - ret = -1; + ret = -EIO; goto error; } @@ -791,11 +791,11 @@ static int af9015_copy_firmware(struct dvb_usb_device *d) if (val == 0x04) { dev_err(&d->udev->dev, "%s: firmware did not run\n", KBUILD_MODNAME); - ret = -1; + ret = -ETIMEDOUT; } else if (val != 0x0c) { dev_err(&d->udev->dev, "%s: firmware boot timeout\n", KBUILD_MODNAME); - ret = -1; + ret = -ETIMEDOUT; } error: