diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
commit | 57bb8587a072c8f76d8f1b1807a78add5ce0f292 (patch) | |
tree | dd0abb5a545cd4f2c4ff3fdf2449f2d413d058b9 /drivers/firewire | |
parent | fe852b0df2ff1e5980e23b71bb08edd55e2b517e (diff) | |
parent | 4453f4fde106d53de1d8532684871b47fc735ec6 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/core-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index f9e3aee6a211..7c2eed76011e 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -1068,7 +1068,7 @@ static void fw_device_init(struct work_struct *work) /* * Transition the device to running state. If it got pulled - * out from under us while we did the intialization work, we + * out from under us while we did the initialization work, we * have to shut down the device again here. Normally, though, * fw_node_event will be responsible for shutting it down when * necessary. We have to use the atomic cmpxchg here to avoid @@ -1231,7 +1231,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) break; /* - * Do minimal intialization of the device here, the + * Do minimal initialization of the device here, the * rest will happen in fw_device_init(). * * Attention: A lot of things, even fw_device_get(), |