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

Commit 36a561d6 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] find_bd_holder() fix



fs/block_dev.c: In function 'find_bd_holder':
fs/block_dev.c:666: warning: return makes integer from pointer without a cast
fs/block_dev.c:669: warning: return makes integer from pointer without a cast
fs/block_dev.c: In function 'add_bd_holder':
fs/block_dev.c:685: warning: unused variable 'tmp'
fs/block_dev.c: In function 'bd_claim_by_kobject':
fs/block_dev.c:773: warning: assignment makes pointer from integer without a cast

Acked-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ae99a78a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -651,7 +651,8 @@ static void free_bd_holder(struct bd_holder *bo)
 * If found, increment the reference count and return the pointer.
 * If not found, returns NULL.
 */
static int find_bd_holder(struct block_device *bdev, struct bd_holder *bo)
static struct bd_holder *find_bd_holder(struct block_device *bdev,
					struct bd_holder *bo)
{
	struct bd_holder *tmp;

@@ -677,7 +678,6 @@ static int find_bd_holder(struct block_device *bdev, struct bd_holder *bo)
 */
static int add_bd_holder(struct block_device *bdev, struct bd_holder *bo)
{
	struct bd_holder *tmp;
	int ret;

	if (!bo)