aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-10-15 14:30:07 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 17:41:09 -0400
commit46fcaec505d957c87b2f3820314f9e4dc0631777 (patch)
treeaff23c2b65c3c0efe41094d16a3a3293055afa1d
parent3b6004f3b5a8b4506fa8dee29667aed44913a990 (diff)
USB: remove warn macro from HID core
There were two stragglers that got missed in the last merge of the HID tree that forgot to change the warn() calls to dev_warn(). This patch fixes them up. Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/hid/usbhid/hid-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 1d3b8a394d46..705a43cdeea4 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -428,7 +428,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
428 usbhid->out[usbhid->outhead].raw_report = kmalloc(len, GFP_ATOMIC); 428 usbhid->out[usbhid->outhead].raw_report = kmalloc(len, GFP_ATOMIC);
429 if (!usbhid->out[usbhid->outhead].raw_report) { 429 if (!usbhid->out[usbhid->outhead].raw_report) {
430 spin_unlock_irqrestore(&usbhid->outlock, flags); 430 spin_unlock_irqrestore(&usbhid->outlock, flags);
431 warn("output queueing failed"); 431 dev_warn(&hid->dev, "output queueing failed\n");
432 return; 432 return;
433 } 433 }
434 hid_output_report(report, usbhid->out[usbhid->outhead].raw_report); 434 hid_output_report(report, usbhid->out[usbhid->outhead].raw_report);
@@ -455,7 +455,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
455 usbhid->ctrl[usbhid->ctrlhead].raw_report = kmalloc(len, GFP_ATOMIC); 455 usbhid->ctrl[usbhid->ctrlhead].raw_report = kmalloc(len, GFP_ATOMIC);
456 if (!usbhid->ctrl[usbhid->ctrlhead].raw_report) { 456 if (!usbhid->ctrl[usbhid->ctrlhead].raw_report) {
457 spin_unlock_irqrestore(&usbhid->ctrllock, flags); 457 spin_unlock_irqrestore(&usbhid->ctrllock, flags);
458 warn("control queueing failed"); 458 dev_warn(&hid->dev, "control queueing failed\n");
459 return; 459 return;
460 } 460 }
461 hid_output_report(report, usbhid->ctrl[usbhid->ctrlhead].raw_report); 461 hid_output_report(report, usbhid->ctrl[usbhid->ctrlhead].raw_report);