diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index c911d838b8ec..2a1cffc8e7be 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1102,7 +1102,7 @@ int lmLogOpen(struct super_block *sb)
 
 	bdev_handle = bdev_open_by_dev(sbi->logdev,
 			BLK_OPEN_READ | BLK_OPEN_WRITE, log, NULL);
-	if (IS_ERR(bdev_handle)) {
+	if (IS_ERR_OR_NULL(bdev_handle)) {
 		rc = PTR_ERR(bdev_handle);
 		goto free;
 	}
diff --git a/block/bdev.c b/block/bdev.c
index 4628dcb1da8a..8665657c28e7 100644
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -840,7 +840,7 @@ struct bdev_handle *bdev_open_by_dev(dev_t dev, blk_mode_t mode, void *holder,
 	bdev = blkdev_get_by_dev(dev, mode, holder, hops);
 	if (IS_ERR(bdev)) {
 		kfree(handle);
-		return ERR_CAST(bdev);
+		return NULL;
 	}
 	handle->bdev = bdev;
 	handle->holder = holder;