Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1b427a33b06ae76c64c1ad9af899a45b682ba6c6

Authored by Bartlomiej Zolnierkiewicz
1 parent fc99856a45
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sgiioc4: fixup message on resource allocation failure 

There can be more than one sgiioc4 card in the system so print
also PCI device name on resource allocation failure (so we know
which one is the problematic one).

Reported-by: Jeremy Higdon <jeremy@sgi.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/ide/pci/sgiioc4.c
Diff comments   View file @ 1b427a3
... ... @@ -621,9 +621,9 @@
621 621 if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,
622 622 DRV_NAME)) {
623 623 printk(KERN_ERR
624   - "%s : %s -- ERROR, Addresses "
  624 + "%s %s: -- ERROR, Addresses "
625 625 "0x%p to 0x%p ALREADY in use\n",
626   - __func__, DRV_NAME, (void *) cmd_phys_base,
  626 + DRV_NAME, pci_name(dev), (void *)cmd_phys_base,
627 627 (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);
628 628 return -ENOMEM;
629 629 }