diff --git a/[refs] b/[refs] index a13b970a5870..4c4e519ffbbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dffe807cdbc6d2409b9bcc87a9517bb7c0d25b65 +refs/heads/master: 1bd405734651c9ebd1c872a452614f9fe381c673 diff --git a/trunk/drivers/scsi/aha152x.c b/trunk/drivers/scsi/aha152x.c index d30a30786dda..f08e71e0205a 100644 --- a/trunk/drivers/scsi/aha152x.c +++ b/trunk/drivers/scsi/aha152x.c @@ -907,9 +907,10 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup) void aha152x_release(struct Scsi_Host *shpnt) { - if(!shpnt) + if (!shpnt) return; + scsi_remove_host(shpnt); if (shpnt->irq) free_irq(shpnt->irq, shpnt); @@ -923,7 +924,6 @@ void aha152x_release(struct Scsi_Host *shpnt) pnp_device_detach(HOSTDATA(shpnt)->pnpdev); #endif - scsi_remove_host(shpnt); list_del(&HOSTDATA(shpnt)->host_list); scsi_host_put(shpnt); }