X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fcdrom%2Fcdrom.c;h=5d28a45d2960c6a40945b134c755ff03a1117c76;hb=1f9e14baa9139fce2265206746fe5491be7726e9;hp=898b84bba28a88b3b61e7cfda3e43f2f7fabb16a;hpb=f71c5d9dd22f4d6b771cdb591050c84946a3e356;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 898b84bba28a..5d28a45d2960 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2180,8 +2180,8 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
 		len = nr * CD_FRAMESIZE_RAW;
 
 		rq = blk_get_request(q, READ, GFP_KERNEL);
-		if (!rq) {
-			ret = -ENOMEM;
+		if (IS_ERR(rq)) {
+			ret = PTR_ERR(rq);
 			break;
 		}
 		blk_rq_set_block_pc(rq);