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

Commit 8bca98ca authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

[PATCH] paride: return proper error code 



This patch makes module init return proper value instead of -1 (-EPERM).

Cc: Tim Waugh <tim@cyberelk.net>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 138ae663

drivers/block/paride/pcd.c

+4 −4
Original line number Diff line number Diff line
@@ -912,12 +912,12 @@ static int __init pcd_init(void) 
	int unit;



	if (disable)

		return -1;

		return -EINVAL;



	pcd_init_units();



	if (pcd_detect())

		return -1;

		return -ENODEV;



	/* get the atapi capabilities page */

	pcd_probe_capabilities();
@@ -925,7 +925,7 @@ static int __init pcd_init(void) 
	if (register_blkdev(major, name)) {

		for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)

			put_disk(cd->disk);

		return -1;

		return -EBUSY;

	}



	pcd_queue = blk_init_queue(do_pcd_request, &pcd_lock);
@@ -933,7 +933,7 @@ static int __init pcd_init(void) 
		unregister_blkdev(major, name);

		for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++)

			put_disk(cd->disk);

		return -1;

		return -ENOMEM;

	}



	for (unit = 0, cd = pcd; unit < PCD_UNITS; unit++, cd++) {

drivers/block/paride/pf.c

+4 −4
Original line number Diff line number Diff line
@@ -933,25 +933,25 @@ static int __init pf_init(void) 
	int unit;



	if (disable)

		return -1;

		return -EINVAL;



	pf_init_units();



	if (pf_detect())

		return -1;

		return -ENODEV;

	pf_busy = 0;



	if (register_blkdev(major, name)) {

		for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)

			put_disk(pf->disk);

		return -1;

		return -EBUSY;

	}

	pf_queue = blk_init_queue(do_pf_request, &pf_spin_lock);

	if (!pf_queue) {

		unregister_blkdev(major, name);

		for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)

			put_disk(pf->disk);

		return -1;

		return -ENOMEM;

	}



	blk_queue_max_phys_segments(pf_queue, cluster);

drivers/block/paride/pg.c

+2 −2
Original line number Diff line number Diff line
@@ -646,14 +646,14 @@ static int __init pg_init(void) 
	int err;



	if (disable){

		err = -1;

		err = -EINVAL;

		goto out;

	}



	pg_init_units();



	if (pg_detect()) {

		err = -1;

		err = -ENODEV;

		goto out;

	}

drivers/block/paride/pt.c

+2 −2
Original line number Diff line number Diff line
@@ -946,12 +946,12 @@ static int __init pt_init(void) 
	int err;



	if (disable) {

		err = -1;

		err = -EINVAL;

		goto out;

	}



	if (pt_detect()) {

		err = -1;

		err = -ENODEV;

		goto out;

	}