[PATCH] USB: fix local variable clash · tjh.dev/kernel@f3d34ed

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[PATCH] USB: fix local variable clash

This patch (as621) fixes a local variable conflict I accidently
introduced into usb_set_configuration.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Alan Stern and committed by

Greg Kroah-Hartman 20 years ago f3d34ed4 3717f295

+3 -3

1 changed file

expand all

drivers

usb

core

message.c

+3 -3

drivers/usb/core/message.c

··· 1387 1387 if (dev->state != USB_STATE_ADDRESS) 1388 1388 usb_disable_device (dev, 1); // Skip ep0 1389 1389 1390 - n = dev->bus_mA - cp->desc.bMaxPower * 2; 1391 - if (n < 0) 1390 + i = dev->bus_mA - cp->desc.bMaxPower * 2; 1391 + if (i < 0) 1392 1392 dev_warn(&dev->dev, "new config #%d exceeds power " 1393 1393 "limit by %dmA\n", 1394 - configuration, -n); 1394 + configuration, -i); 1395 1395 1396 1396 if ((ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), 1397 1397 USB_REQ_SET_CONFIGURATION, 0, configuration, 0,