From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Fri, 21 Feb 2025 03:57:46 +0000 (-0500)
Subject: Merge branch 'misc' into for-next
X-Git-Tag: next-20250224~33^2~1
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=b49c36c14df24c3462755aa09d4faa20c9d289bf;p=linux%2F.git

Merge branch 'misc' into for-next
---

b49c36c14df24c3462755aa09d4faa20c9d289bf
diff --cc drivers/ufs/core/ufshcd.c
index 1893a7ad9531,ef56a5eb52dc..3c3f2101a4a5
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -6199,8 -6214,13 +6199,13 @@@ static void ufshcd_exception_event_hand
  		ufshcd_bkops_exception_event_handler(hba);
  
  	if (status & hba->ee_drv_mask & MASK_EE_URGENT_TEMP)
 -		ufshcd_temp_exception_event_handler(hba, status);
 +		ufs_hwmon_notify_event(hba, status & MASK_EE_URGENT_TEMP);
  
+ 	if (status & hba->ee_drv_mask & MASK_EE_HEALTH_CRITICAL) {
+ 		hba->critical_health_count++;
+ 		sysfs_notify(&hba->dev->kobj, NULL, "critical_health");
+ 	}
+ 
  	ufs_debugfs_exception_event(hba, status);
  }