From: Ben Collins <bcollins@ubuntu.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 12/15] via-pmu: Wrap some uses of sleep_in_progress with proper ifdef's
Date: Wed, 04 Jan 2006 17:01:21 -0500 [thread overview]
Message-ID: <0ISL00EOC96O6A@a34-mta01.direcway.com> (raw)
Basically completes what's already in the rest of the driver.
sleep_in_progress is only defined for pm+ppc32.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
---
drivers/macintosh/via-pmu.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
3ab202d5d55c3ea17d88454b212a0363f9a2b115
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 5640435..64549ad 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2911,8 +2911,10 @@ pmu_ioctl(struct inode * inode, struct f
* the fbdev
*/
case PMU_IOC_GET_BACKLIGHT:
+#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
if (sleep_in_progress)
return -EBUSY;
+#endif
error = get_backlight_level();
if (error < 0)
return error;
@@ -2920,8 +2922,10 @@ pmu_ioctl(struct inode * inode, struct f
case PMU_IOC_SET_BACKLIGHT:
{
__u32 value;
+#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
if (sleep_in_progress)
return -EBUSY;
+#endif
error = get_user(value, argp);
if (!error)
error = set_backlight_level(value);
--
1.0.5
next reply other threads:[~2006-01-04 22:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-04 22:01 Ben Collins [this message]
2006-01-04 19:34 ` Kristian Mueller
2006-01-05 14:17 ` Ben Collins
2006-01-05 17:22 ` Kristian Mueller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0ISL00EOC96O6A@a34-mta01.direcway.com \
--to=bcollins@ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®