drivers/rapidio/devices/tsi721.c: fix error return code

[~andy/linux] / drivers / rapidio / devices / tsi721.c

diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index d5e1625bbac2432ff7965a2b70ab438b98aa4959..78dff6f407367a21eed9495b523ee4ca7e03cfc3 100644 (file)
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -2165,7 +2165,8 @@ static int __devinit tsi721_setup_mport(struct tsi721_device *priv)
        rio_init_dbell_res(&mport->riores[RIO_DOORBELL_RESOURCE], 0, 0xffff);
        rio_init_mbox_res(&mport->riores[RIO_INB_MBOX_RESOURCE], 0, 3);
        rio_init_mbox_res(&mport->riores[RIO_OUTB_MBOX_RESOURCE], 0, 3);
-       strcpy(mport->name, "Tsi721 mport");
+       snprintf(mport->name, RIO_MAX_MPORT_NAME, "%s(%s)",
+                dev_driver_string(&pdev->dev), dev_name(&pdev->dev));
 
        /* Hook up interrupt handler */
 
@@ -2315,7 +2316,8 @@ static int __devinit tsi721_probe(struct pci_dev *pdev,
 
        /* Configure DMA attributes. */
        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
-               if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
+               err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+               if (err) {
                        dev_info(&pdev->dev, "Unable to set DMA mask\n");
                        goto err_unmap_bars;
                }