diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-23 11:20:07 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-05-30 13:49:03 -0400 |
commit | 2177f80076ebc15cc58fb521b58e49c83315f34e (patch) | |
tree | 3690868d86f360c07c79ea21269ec198293dbec2 /recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0034-usb-musb-omap-fix-the-error-check-for-pm_runtime_get.patch | |
parent | d9d51a11b8ff53c5ee7ef12e221479a24e071f13 (diff) | |
download | meta-ti-2177f80076ebc15cc58fb521b58e49c83315f34e.tar.gz |
linux-ti33x-psp 3.2: update to 3.2.18
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0034-usb-musb-omap-fix-the-error-check-for-pm_runtime_get.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0034-usb-musb-omap-fix-the-error-check-for-pm_runtime_get.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0034-usb-musb-omap-fix-the-error-check-for-pm_runtime_get.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0034-usb-musb-omap-fix-the-error-check-for-pm_runtime_get.patch new file mode 100644 index 00000000..035b0002 --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0034-usb-musb-omap-fix-the-error-check-for-pm_runtime_get.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 150f1a9111e30cc70efdac57e72af7d537754099 Mon Sep 17 00:00:00 2001 | ||
2 | From: Shubhrajyoti D <shubhrajyoti@ti.com> | ||
3 | Date: Thu, 22 Mar 2012 12:48:06 +0530 | ||
4 | Subject: [PATCH 034/165] usb: musb: omap: fix the error check for | ||
5 | pm_runtime_get_sync | ||
6 | |||
7 | commit ad579699c4f0274bf522a9252ff9b20c72197e48 upstream. | ||
8 | |||
9 | pm_runtime_get_sync returns a signed integer. In case of errors | ||
10 | it returns a negative value. This patch fixes the error check | ||
11 | by making it signed instead of unsigned thus preventing register | ||
12 | access if get_sync_fails. Also passes the error cause to the | ||
13 | debug message. | ||
14 | |||
15 | Cc: Kishon Vijay Abraham I <kishon@ti.com> | ||
16 | Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> | ||
17 | Signed-off-by: Felipe Balbi <balbi@ti.com> | ||
18 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> | ||
19 | --- | ||
20 | drivers/usb/musb/omap2430.c | 5 +++-- | ||
21 | 1 files changed, 3 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c | ||
24 | index bd93e9f..522ac37 100644 | ||
25 | --- a/drivers/usb/musb/omap2430.c | ||
26 | +++ b/drivers/usb/musb/omap2430.c | ||
27 | @@ -283,7 +283,8 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work) | ||
28 | |||
29 | static int omap2430_musb_init(struct musb *musb) | ||
30 | { | ||
31 | - u32 l, status = 0; | ||
32 | + u32 l; | ||
33 | + int status = 0; | ||
34 | struct device *dev = musb->controller; | ||
35 | struct musb_hdrc_platform_data *plat = dev->platform_data; | ||
36 | struct omap_musb_board_data *data = plat->board_data; | ||
37 | @@ -302,7 +303,7 @@ static int omap2430_musb_init(struct musb *musb) | ||
38 | |||
39 | status = pm_runtime_get_sync(dev); | ||
40 | if (status < 0) { | ||
41 | - dev_err(dev, "pm_runtime_get_sync FAILED"); | ||
42 | + dev_err(dev, "pm_runtime_get_sync FAILED %d\n", status); | ||
43 | goto err1; | ||
44 | } | ||
45 | |||
46 | -- | ||
47 | 1.7.7.6 | ||
48 | |||