2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index d5e1625bbac2..19743597cd95 100644
--- 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 */
 
diff --git a/include/linux/rio.h b/include/linux/rio.h
index a90ebadd9da0..1a7b6c7787a5 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -30,6 +30,7 @@
 #define RIO_MAX_MPORTS          8
 #define RIO_MAX_MPORT_RESOURCES 16
 #define RIO_MAX_DEV_RESOURCES   16
+#define RIO_MAX_MPORT_NAME      40
 
 #define RIO_GLOBAL_TABLE        0xff    /* Indicates access of a switch's
                                            global routing table if it
@@ -255,7 +256,7 @@ struct rio_mport {
                                  */
         enum rio_phy_type phy_type;     /* RapidIO phy type */
         u32 phys_efptr;
-        unsigned char name[40];
+        unsigned char name[RIO_MAX_MPORT_NAME];
         void *priv;             /* Master port private data */
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
         struct dma_device       dma;