Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / usb / host / oxu210hp-hcd.c

diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 38193f4e980e04eda0bb8ac5169095c27b544b3e..4a771f6cc822306ae5708aa8f3ceec36aae72e44 100644 (file)
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -2879,7 +2879,7 @@ static int oxu_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
        /* Ok, we have more job to do! :) */
 
        for (i = 0; i < num - 1; i++) {
-               /* Get free micro URB poll till a free urb is recieved */
+               /* Get free micro URB poll till a free urb is received */
 
                do {
                        murb = (struct urb *) oxu_murb_alloc(oxu);
@@ -2911,7 +2911,7 @@ static int oxu_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
 
        /* Last urb requires special handling  */
 
-       /* Get free micro URB poll till a free urb is recieved */
+       /* Get free micro URB poll till a free urb is received */
        do {
                murb = (struct urb *) oxu_murb_alloc(oxu);
                if (!murb)
@@ -3832,7 +3832,7 @@ static int oxu_drv_probe(struct platform_device *pdev)
                return -EBUSY;
        }
 
-       ret = set_irq_type(irq, IRQF_TRIGGER_FALLING);
+       ret = irq_set_irq_type(irq, IRQF_TRIGGER_FALLING);
        if (ret) {
                dev_err(&pdev->dev, "error setting irq type\n");
                ret = -EFAULT;