diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 18:43:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 18:43:52 -0400 |
commit | 0cfd81031a26717fe14380d18275f8e217571615 (patch) | |
tree | 78a84e4cb97e7f45eb77dc0fbd8857a5dd717869 /drivers/usb/misc/emi62.c | |
parent | f7ea4a4ba84f382e8eb143e435551de0feee5b4b (diff) | |
parent | 802f389a2cc6e2771b8de915ac241456d41eb79e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (94 commits)
USB: remove err() macro from more usb drivers
USB: remove err() macro from usb misc drivers
USB: remove err() macro from usb core code
USB: remove err() macro from usb class drivers
USB: remove use of err() in drivers/usb/serial
USB: remove info() macro from usb mtd drivers
USB: remove info() macro from usb input drivers
USB: remove info() macro from usb network drivers
USB: remove info() macro from remaining usb drivers
USB: remove info() macro from usb/misc drivers
USB: remove info() macro from usb/serial drivers
USB: remove warn macro from HID core
USB: remove warn() macro from usb drivers
USB: remove warn() macro from usb net drivers
USB: remove warn() macro from usb media drivers
USB: remove warn() macro from usb input drivers
usb/fsl_qe_udc: clear data toggle on clear halt request
usb/fsl_qe_udc: fix response to get status request
fsl_usb2_udc: Fix oops on probe failure.
fsl_usb2_udc: Add a wmb before priming endpoint.
...
Diffstat (limited to 'drivers/usb/misc/emi62.c')
-rw-r--r-- | drivers/usb/misc/emi62.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 5d859ded5bbf..602ee05ba9ff 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c | |||
@@ -73,7 +73,7 @@ static int emi62_writememory(struct usb_device *dev, int address, | |||
73 | static int emi62_set_reset (struct usb_device *dev, unsigned char reset_bit) | 73 | static int emi62_set_reset (struct usb_device *dev, unsigned char reset_bit) |
74 | { | 74 | { |
75 | int response; | 75 | int response; |
76 | info("%s - %d", __func__, reset_bit); | 76 | dev_info(&dev->dev, "%s - %d\n", __func__, reset_bit); |
77 | 77 | ||
78 | response = emi62_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0); | 78 | response = emi62_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0); |
79 | if (response < 0) { | 79 | if (response < 0) { |
@@ -271,7 +271,7 @@ static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
271 | struct usb_device *dev = interface_to_usbdev(intf); | 271 | struct usb_device *dev = interface_to_usbdev(intf); |
272 | dev_dbg(&intf->dev, "emi62_probe\n"); | 272 | dev_dbg(&intf->dev, "emi62_probe\n"); |
273 | 273 | ||
274 | info("%s start", __func__); | 274 | dev_info(&intf->dev, "%s start\n", __func__); |
275 | 275 | ||
276 | emi62_load_firmware(dev); | 276 | emi62_load_firmware(dev); |
277 | 277 | ||