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

Commit c256e95f authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents 38ebb1e0 c71d6be5

drivers/scsi/ata_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev, 
		case IDE:

			WARN_ON((i & 1) || map[i + 1] != IDE);

			pinfo[i / 2] = piix_port_info[ich5_pata];

			pinfo[i / 2].private_data = hpriv;

			i++;

			printk(" IDE IDE");

			break;

drivers/scsi/libata-core.c

+8 −26
Original line number Diff line number Diff line
@@ -5185,28 +5185,6 @@ void ata_host_stop (struct ata_host_set *host_set) 
		iounmap(host_set->mmio_base);

}





/**

 *	ata_host_remove - Unregister SCSI host structure with upper layers

 *	@ap: Port to unregister

 *	@do_unregister: 1 if we fully unregister, 0 to just stop the port

 *

 *	LOCKING:

 *	Inherited from caller.

 */



static void ata_host_remove(struct ata_port *ap, unsigned int do_unregister)

{

	struct Scsi_Host *sh = ap->host;



	DPRINTK("ENTER\n");



	if (do_unregister)

		scsi_remove_host(sh);



	ap->ops->port_stop(ap);

}



/**

 *	ata_dev_init - Initialize an ata_device structure

 *	@dev: Device structure to initialize
@@ -5532,8 +5510,11 @@ int ata_device_add(const struct ata_probe_ent *ent) 


err_out:

	for (i = 0; i < count; i++) {

		ata_host_remove(host_set->ports[i], 1);

		scsi_host_put(host_set->ports[i]->host);

		struct ata_port *ap = host_set->ports[i];

		if (ap) {

			ap->ops->port_stop(ap);

			scsi_host_put(ap->host);

		}

	}

err_free_ret:

	kfree(host_set);
@@ -5558,7 +5539,7 @@ void ata_port_detach(struct ata_port *ap) 
	int i;



	if (!ap->ops->error_handler)

		return;

		goto skip_eh;



	/* tell EH we're leaving & flush EH */

	spin_lock_irqsave(ap->lock, flags);
@@ -5594,6 +5575,7 @@ void ata_port_detach(struct ata_port *ap) 
	cancel_delayed_work(&ap->hotplug_task);

	flush_workqueue(ata_aux_wq);



 skip_eh:

	/* remove the associated SCSI host */

	scsi_remove_host(ap->host);

}
@@ -5662,7 +5644,7 @@ int ata_scsi_release(struct Scsi_Host *host) 
	DPRINTK("ENTER\n");



	ap->ops->port_disable(ap);

	ata_host_remove(ap, 0);

	ap->ops->port_stop(ap);



	DPRINTK("EXIT\n");

	return 1;

drivers/scsi/sata_sil24.c

+0 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,6 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	probe_ent->irq = pdev->irq;

	probe_ent->irq_flags = IRQF_SHARED;

	probe_ent->mmio_base = port_base;

	probe_ent->private_data = hpriv;



	hpriv->host_base = host_base;