---

yaml --- r: 331070 b: refs/heads/master c: e1e9e51 h: refs/heads/master v: v3
git-mirror · Sep 23, 2012 · 4569d5e · 4569d5e
1 parent efe63cd
commit 4569d5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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: