[folded-merged] rtc-ds1374-add-watchdog-support-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: rtc-ds1374-add-watchdog-support-fix
has been removed from the -mm tree.  Its filename was
     rtc-ds1374-add-watchdog-support-fix.patch

This patch was dropped because it was folded into rtc-ds1374-add-watchdog-support.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: rtc-ds1374-add-watchdog-support-fix

don't forget mutex_unlock() in ds1374_wdt_open() error path

Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Soeren Andersen <san@xxxxxxxxxxxxxxxxx>
Cc: Søren Andersen <san@xxxxxxxxxxxxxxxxx>
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/rtc/rtc-ds1374.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff -puN drivers/rtc/Kconfig~rtc-ds1374-add-watchdog-support-fix drivers/rtc/Kconfig
diff -puN drivers/rtc/rtc-ds1374.c~rtc-ds1374-add-watchdog-support-fix drivers/rtc/rtc-ds1374.c
--- a/drivers/rtc/rtc-ds1374.c~rtc-ds1374-add-watchdog-support-fix
+++ a/drivers/rtc/rtc-ds1374.c
@@ -458,8 +458,10 @@ static int ds1374_wdt_open(struct inode
 
 	if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
 		mutex_lock(&ds1374->mutex);
-		if (test_and_set_bit(0, &wdt_is_open))
+		if (test_and_set_bit(0, &wdt_is_open)) {
+			mutex_unlock(&ds1374->mutex);
 			return -EBUSY;
+		}
 		/*
 		 *      Activate
 		 */
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

origin.patch
mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory.patch
slab-improve-checking-for-invalid-gfp_flags.patch
mm-memcontrol-lockless-page-counters.patch
kernel-res_counter-remove-the-unused-api.patch
mm-compaction-simplify-deferred-compaction.patch
mm-compaction-always-update-cached-scanner-positions.patch
mm-memcontrol-remove-unnecessary-pcg_used-pc-mem_cgroup-valid-flag.patch
mm-fix-huge-zero-page-accounting-in-smaps-report.patch
fs-proc-use-a-rb-tree-for-the-directory-entries.patch
fs-binfmt_miscc-use-gfp_kernel-instead-of-gfp_user.patch
init-allow-config_init_fallback=n-to-disable-defaults-if-init=-fails.patch
rtc-omap-add-support-for-pmic_power_en.patch
drivers-rtc-rtc-sirfsocc-add-alarm_irq_enable-support.patch
rtc-ds1374-add-watchdog-support.patch
rtc-ds1374-add-watchdog-support-checkpatch-fixes.patch
exit-wait-cleanup-the-ptrace_reparented-checks-fix.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux