1 |
ssuominen 12/11/04 13:53:22 |
2 |
|
3 |
Added: udisks-1.0.4-kernel-2.6.36-compat.patch |
4 |
Log: |
5 |
Migrate to udev.eclass. Backport Linux >= 2.6.36 compability patch, as in, use power/control instead of power/level when available. |
6 |
|
7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: udisks-1.0.4-kernel-2.6.36-compat.patch |
16 |
=================================================================== |
17 |
From bf5c28a8dd4eedae51db27fa7b9f84dec425f8bd Mon Sep 17 00:00:00 2001 |
18 |
From: Edward Sheldrake <ejsheldrake@×××××.com> |
19 |
Date: Sun, 04 Sep 2011 18:42:17 +0000 |
20 |
Subject: Fix power/level deprecation kernel warning |
21 |
|
22 |
If present, use power/control instead. |
23 |
|
24 |
https://bugs.freedesktop.org/show_bug.cgi?id=32056 |
25 |
|
26 |
Signed-off-by: David Zeuthen <zeuthen@×××××.com> |
27 |
--- |
28 |
diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c |
29 |
index fc88043..eeafcab 100644 |
30 |
--- a/src/helpers/job-drive-detach.c |
31 |
+++ b/src/helpers/job-drive-detach.c |
32 |
@@ -235,7 +235,12 @@ main (int argc, |
33 |
if (endp != NULL && num_interfaces == 1) |
34 |
{ |
35 |
g_printerr ("Suspending USB device: "); |
36 |
- if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/level", "auto") || |
37 |
+ if (sysfs_exists (udev_device_get_syspath (udevice_usb_device), "power/control")) |
38 |
+ power_level_path = "power/control"; |
39 |
+ else |
40 |
+ power_level_path = "power/level"; |
41 |
+ |
42 |
+ if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), power_level_path, "auto") || |
43 |
!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/autosuspend", "0")) |
44 |
goto out; |
45 |
g_printerr ("OK\n"); |
46 |
@@ -259,7 +264,6 @@ main (int argc, |
47 |
out: |
48 |
g_free (usb_interface_name); |
49 |
g_free (unbind_path); |
50 |
- g_free (power_level_path); |
51 |
if (sg_fd > 0) |
52 |
sg_cmds_close_device (sg_fd); |
53 |
if (udevice != NULL) |
54 |
-- |
55 |
cgit v0.9.0.2-2-gbebe |