Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

[pandora-kernel.git] / drivers / mmc / host / vub300.c

diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index d4455ff..e8f6e65 100644 (file)
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -1625,8 +1625,8 @@ static void __vub300_command_response(struct vub300_mmc_host *vub300,
                cmd->error = respretval;
        } else if (cmd->error) {
                /*
-                * the error occured sending the command
-                * or recieving the response
+                * the error occurred sending the command
+                * or receiving the response
                 */
        } else if (vub300->command_out_urb->status) {
                vub300->usb_transport_fail = vub300->command_out_urb->status;