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

Commit 0cdc82ee authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[PATCH] mesh scsi: fix error handling 



The PowerMac mesh SCSI driver had some missing error handling which would
trigger warnings due to lack of handling of return value from
scsi_add_host.  This fixes it.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 98b4f592

drivers/scsi/mesh.c

+21 −8
Original line number Diff line number Diff line
@@ -1959,16 +1959,29 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	/* Set it up */

       	mesh_init(ms);



	/* XXX FIXME: error should be fatal */

       	if (request_irq(ms->meshintr, do_mesh_interrupt, 0, "MESH", ms))

	/* Request interrupt */

       	if (request_irq(ms->meshintr, do_mesh_interrupt, 0, "MESH", ms)) {

	       	printk(KERN_ERR "MESH: can't get irq %d\n", ms->meshintr);

		goto out_shutdown;

	}



	/* XXX FIXME: handle failure */

	scsi_add_host(mesh_host, &mdev->ofdev.dev);

	/* Add scsi host & scan */

	if (scsi_add_host(mesh_host, &mdev->ofdev.dev))

		goto out_release_irq;

	scsi_scan_host(mesh_host);



	return 0;



 out_release_irq:

	free_irq(ms->meshintr, ms);

 out_shutdown:

	/* shutdown & reset bus in case of error or macos can be confused

	 * at reboot if the bus was set to synchronous mode already

	 */

	mesh_shutdown(mdev);

	set_mesh_power(ms, 0);

	pci_free_consistent(macio_get_pci_dev(mdev), ms->dma_cmd_size,

			    ms->dma_cmd_space, ms->dma_cmd_bus);

 out_unmap:

	iounmap(ms->dma);

	iounmap(ms->mesh);