Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b68bb2632453a9ca7d10a00d79adf60968cb4c05

Authored by David Brownell
Committed by Linus Torvalds
1 parent 950d442ad0
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

rtc: don't return -EBUSY when mutex_lock_interruptible() fails 

It was pointed out that the RTC framework handles its mutex locks oddly
...  returning -EBUSY when interrupted.  This fixes that by returning the
value of mutex_lock_interruptible() (i.e.  -EINTR).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/rtc/interface.c
Diff comments   View file @ b68bb26
... ... @@ -20,7 +20,7 @@
20 20  
21 21 err = mutex_lock_interruptible(&rtc->ops_lock);
22 22 if (err)
23   - return -EBUSY;
  23 + return err;
24 24  
25 25 if (!rtc->ops)
26 26 err = -ENODEV;
... ... @@ -46,7 +46,7 @@
46 46  
47 47 err = mutex_lock_interruptible(&rtc->ops_lock);
48 48 if (err)
49   - return -EBUSY;
  49 + return err;
50 50  
51 51 if (!rtc->ops)
52 52 err = -ENODEV;
... ... @@ -66,7 +66,7 @@
66 66  
67 67 err = mutex_lock_interruptible(&rtc->ops_lock);
68 68 if (err)
69   - return -EBUSY;
  69 + return err;
70 70  
71 71 if (!rtc->ops)
72 72 err = -ENODEV;
... ... @@ -106,7 +106,7 @@
106 106  
107 107 err = mutex_lock_interruptible(&rtc->ops_lock);
108 108 if (err)
109   - return -EBUSY;
  109 + return err;
110 110  
111 111 if (rtc->ops == NULL)
112 112 err = -ENODEV;
... ... @@ -293,7 +293,7 @@
293 293  
294 294 err = mutex_lock_interruptible(&rtc->ops_lock);
295 295 if (err)
296   - return -EBUSY;
  296 + return err;
297 297  
298 298 if (!rtc->ops)
299 299 err = -ENODEV;
drivers/rtc/rtc-dev.c
Diff comments   View file @ b68bb26
... ... @@ -221,7 +221,7 @@
221 221  
222 222 err = mutex_lock_interruptible(&rtc->ops_lock);
223 223 if (err)
224   - return -EBUSY;
  224 + return err;
225 225  
226 226 /* check that the calling task has appropriate permissions
227 227 * for certain ioctls. doing this check here is useful