--- zzzz-none-000/linux-2.6.28.10/drivers/usb/core/generic.c	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/drivers/usb/core/generic.c	2011-10-18 13:17:13.000000000 +0000
@@ -21,6 +21,11 @@
 #include "usb.h"
 #include "hcd.h"
 
+#ifdef CONFIG_AVM_POWERMETER
+#include <linux/avm_power.h>
+#endif /*--- #ifdef CONFIG_AVM_POWERMETER ---*/
+
+
 static inline const char *plural(int n)
 {
 	return (n == 1 ? "" : "s");
@@ -102,6 +107,43 @@
 			continue;
 		}
 
+#if defined(CONFIG_AVM_POWERMETER)
+
+		if (udev->level == 1) {
+
+			unsigned nextmA = (c->desc.bMaxPower * 2);
+
+			/* A device should display at least 100 mA in AVM_POWERMETER */
+			if (nextmA < 100) {
+				nextmA = 100;
+			}
+			
+			{
+#if defined(CONFIG_AR9)
+				unsigned totalmA = PowerManagmentActivatePowerMode("usb_current_req");
+				if ((nextmA + totalmA) > 600) {
+					if (le16_to_cpu(udev->descriptor.idVendor) != 0x057C) {
+						printk (KERN_INFO "AVM: rejecting new USB device with %u mA; old power was %u mA!\n", nextmA, totalmA);
+						insufficient_power++;
+						continue;
+					}
+				} else
+#endif // CONFIG_AR9
+				{
+					unsigned avm_powerdevice;
+#if defined (CONFIG_FUSIV_VX180) || defined (CONFIG_MACH_AR934x) 
+					avm_powerdevice = (udev->portnum == 1)? powerdevice_usb_host : powerdevice_usb_host2;
+					printk (KERN_INFO "Port#%u config: AVM Powermeter changed to %u mA\n", udev->portnum, nextmA);
+#else
+					avm_powerdevice = (udev->bus->busnum == 1)? powerdevice_usb_host : powerdevice_usb_host2;
+					printk (KERN_INFO "Bus#%u config: AVM Powermeter changed to %u mA\n", udev->bus->busnum, nextmA);
+#endif
+					PowerManagmentRessourceInfo(avm_powerdevice, nextmA);
+				}
+			}
+		}
+#endif // CONFIG_AVM_POWERMETER
+
 		/* When the first config's first interface is one of Microsoft's
 		 * pet nonstandard Ethernet-over-USB protocols, ignore it unless
 		 * this kernel has enabled the necessary host side driver.
@@ -160,6 +202,10 @@
 	 */
 	if (udev->authorized == 0)
 		dev_err(&udev->dev, "Device is not authorized for usage\n");
+#if 1 /* == 20111018 AVM/WK Extension  == */
+	else if (udev->noprobe)
+		dev_err(&udev->dev, "Probing is disabled for this device\n");
+#endif
 	else {
 		c = usb_choose_configuration(udev);
 		if (c >= 0) {