Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (955c5038) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/scsi/libata-core.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -370,6 +370,8 @@ static void ata_tf_read_pio(struct ata_port ap, struct ata_taskfile tf)
		{
		struct ata_ioports *ioaddr = &ap->ioaddr;

		tf->command = ata_check_status(ap);
		tf->feature = ata_chk_err(ap);
		tf->nsect = inb(ioaddr->nsect_addr);
		tf->lbal = inb(ioaddr->lbal_addr);
		tf->lbam = inb(ioaddr->lbam_addr);
		@@ -402,6 +404,8 @@ static void ata_tf_read_mmio(struct ata_port ap, struct ata_taskfile tf)
		{
		struct ata_ioports *ioaddr = &ap->ioaddr;

		tf->command = ata_check_status(ap);
		tf->feature = ata_chk_err(ap);
		tf->nsect = readb((void __iomem *)ioaddr->nsect_addr);
		tf->lbal = readb((void __iomem *)ioaddr->lbal_addr);
		tf->lbam = readb((void __iomem *)ioaddr->lbam_addr);
		@@ -4254,11 +4258,10 @@ int ata_device_add(const struct ata_probe_ent *ent)

		DPRINTK("ENTER\n");
		/* alloc a container for our list of ATA ports (buses) */
		host_set = kmalloc(sizeof(struct ata_host_set) +
		host_set = kzalloc(sizeof(struct ata_host_set) +
		(ent->n_ports * sizeof(void *)), GFP_KERNEL);
		if (!host_set)
		return 0;
		memset(host_set, 0, sizeof(struct ata_host_set) + (ent->n_ports * sizeof(void *)));
		spin_lock_init(&host_set->lock);

		host_set->dev = dev;
		@@ -4298,10 +4301,8 @@ int ata_device_add(const struct ata_probe_ent *ent)
		count++;
		}

		if (!count) {
		kfree(host_set);
		return 0;
		}
		if (!count)
		goto err_free_ret;

		/* obtain irq, that is shared between channels */
		if (request_irq(ent->irq, ent->port_ops->irq_handler, ent->irq_flags,
		@@ -4359,6 +4360,7 @@ err_out:
		ata_host_remove(host_set->ports[i], 1);
		scsi_host_put(host_set->ports[i]->host);
		}
		err_free_ret:
		kfree(host_set);
		VPRINTK("EXIT, returning 0\n");
		return 0;
		@@ -4468,15 +4470,13 @@ ata_probe_ent_alloc(struct device dev, const struct ata_port_info port)
		{
		struct ata_probe_ent *probe_ent;

		probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
		probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);
		if (!probe_ent) {
		printk(KERN_ERR DRV_NAME "(%s): out of memory\n",
		kobject_name(&(dev->kobj)));
		return NULL;
		}

		memset(probe_ent, 0, sizeof(*probe_ent));

		INIT_LIST_HEAD(&probe_ent->node);
		probe_ent->dev = dev;