diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-30 12:38:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 12:38:53 +0000 |
| commit | 34f653345018c42cedea89b7f6a4aba3783ebd7b (patch) | |
| tree | 663f490f3e16571516dbcce7a2cb2f2545f79dee /drivers/media/usb/pwc/pwc-if.c | |
| parent | 3b58ee13da7510115b66f71c67c9e87b47e9c4aa (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into regmap-core
Needed as a subsequent patch is built on some of the fixes.
Linux 3.13-rc4
Diffstat (limited to 'drivers/media/usb/pwc/pwc-if.c')
| -rw-r--r-- | drivers/media/usb/pwc/pwc-if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 77bbf7889659..78c9bc8e7f56 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c @@ -1039,7 +1039,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id /* Set the leds off */ pwc_set_leds(pdev, 0, 0); - /* Setup intial videomode */ + /* Setup initial videomode */ rc = pwc_set_video_mode(pdev, MAX_WIDTH, MAX_HEIGHT, V4L2_PIX_FMT_YUV420, 30, &compression, 1); if (rc) |