From bf5c28a8dd4eedae51db27fa7b9f84dec425f8bd Mon Sep 17 00:00:00 2001
From: Edward Sheldrake <ejsheldrake@gmail.com>
Date: Sun, 04 Sep 2011 18:42:17 +0000
Subject: Fix power/level deprecation kernel warning

If present, use power/control instead.

https://bugs.freedesktop.org/show_bug.cgi?id=32056

Signed-off-by: David Zeuthen <zeuthen@gmail.com>
---
diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
index fc88043..eeafcab 100644
--- a/src/helpers/job-drive-detach.c
+++ b/src/helpers/job-drive-detach.c
@@ -235,7 +235,12 @@ main (int argc,
   if (endp != NULL && num_interfaces == 1)
     {
       g_printerr ("Suspending USB device: ");
-      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/level", "auto") ||
+      if (sysfs_exists (udev_device_get_syspath (udevice_usb_device), "power/control"))
+        power_level_path = "power/control";
+      else
+        power_level_path = "power/level";
+      
+      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), power_level_path, "auto") ||
           !sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/autosuspend", "0"))
         goto out;
       g_printerr ("OK\n");
@@ -259,7 +264,6 @@ main (int argc,
  out:
   g_free (usb_interface_name);
   g_free (unbind_path);
-  g_free (power_level_path);
   if (sg_fd > 0)
     sg_cmds_close_device (sg_fd);
   if (udevice != NULL)
--
cgit v0.9.0.2-2-gbebe