Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 (d798f7f0) · Commits · 戴 / test

drivers/ide/ide-acpi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -416,21 +416,21 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)

		out_obj = output.pointer;
		if (out_obj->type != ACPI_TYPE_BUFFER) {
		kfree(output.pointer);
		DEBPRINT("Run _GTM: error: "
		"expected object type of ACPI_TYPE_BUFFER, "
		"got 0x%x\n", out_obj->type);
		kfree(output.pointer);
		return;
		}

		if (!out_obj->buffer.length \|\| !out_obj->buffer.pointer \|\|
		out_obj->buffer.length != sizeof(struct GTM_buffer)) {
		kfree(output.pointer);
		printk(KERN_ERR
		"%s: unexpected _GTM length (0x%x)[should be 0x%zx] or "
		"addr (0x%p)\n",
		__func__, out_obj->buffer.length,
		sizeof(struct GTM_buffer), out_obj->buffer.pointer);
		kfree(output.pointer);
		return;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc)
		drive->failed_pc = NULL;

		if (pc->c[0] == GPCMD_READ_10 \|\| pc->c[0] == GPCMD_WRITE_10 \|\|
		(rq && rq->cmd_type == REQ_TYPE_BLOCK_PC))
		rq->cmd_type == REQ_TYPE_BLOCK_PC)
		uptodate = 1; /* FIXME */
		else if (pc->c[0] == GPCMD_REQUEST_SENSE) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ static int __init ide_scan_pcibus(void)
		struct list_head l, n;

		pre_init = 0;
		while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
		for_each_pci_dev(dev)
		ide_scan_pcidev(dev);

		/*

+2 −2

Original line number	Diff line number	Diff line
		@@ -1334,7 +1334,7 @@ out_free_pmif:
		static int
		pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
		{
		pmac_ide_hwif_t pmif = (pmac_ide_hwif_t )pci_get_drvdata(pdev);
		pmac_ide_hwif_t *pmif = pci_get_drvdata(pdev);
		int rc = 0;

		if (mesg.event != pdev->dev.power.power_state.event
		@@ -1350,7 +1350,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
		static int
		pmac_ide_pci_resume(struct pci_dev *pdev)
		{
		pmac_ide_hwif_t pmif = (pmac_ide_hwif_t )pci_get_drvdata(pdev);
		pmac_ide_hwif_t *pmif = pci_get_drvdata(pdev);
		int rc = 0;

		if (pdev->dev.power.power_state.event != PM_EVENT_ON) {

+1 −1