1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 0ca66645e10c..7168e7f24437 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3623,7 +3623,8 @@ qla2x00_timer(scsi_qla_host_t *vha)
         if (!pci_channel_offline(ha->pdev))
                 pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);
 
-        if (IS_QLA82XX(ha)) {
+        /* Make sure qla82xx_watchdog is run only for physical port */
+        if (!vha->vp_idx && IS_QLA82XX(ha)) {
                 if (test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags))
                         start_dpc++;
                 qla82xx_watchdog(vha);
@@ -3704,8 +3705,8 @@ qla2x00_timer(scsi_qla_host_t *vha)
                     atomic_read(&vha->loop_down_timer)));
         }
 
-        /* Check if beacon LED needs to be blinked */
-        if (ha->beacon_blink_led == 1) {
+        /* Check if beacon LED needs to be blinked for physical host only */
+        if (!vha->vp_idx && (ha->beacon_blink_led == 1)) {
                 set_bit(BEACON_BLINK_NEEDED, &vha->dpc_flags);
                 start_dpc++;
         }