diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 16:36:37 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 16:36:37 -0800 |
commit | 6a8c62f3e97fdf184fde60bc99155476e8e9cd55 (patch) | |
tree | 71b818d584f79baf1a192df65c758a592a63360d /drivers/media/usb/gspca/pac207.c | |
parent | b46d0c46ccaa366a5bb8ac709fdf2bcaa76221fd (diff) | |
parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
download | talos-obmc-linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.tar.gz talos-obmc-linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.zip |
Merge 3.13-rc4 into tty-next
We want the fixes in here as well.
Diffstat (limited to 'drivers/media/usb/gspca/pac207.c')
-rw-r--r-- | drivers/media/usb/gspca/pac207.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c index cd79c180f67b..07529e5a0c56 100644 --- a/drivers/media/usb/gspca/pac207.c +++ b/drivers/media/usb/gspca/pac207.c @@ -416,7 +416,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, #if IS_ENABLED(CONFIG_INPUT) static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, /* interrupt packet data */ - int len) /* interrput packet length */ + int len) /* interrupt packet length */ { int ret = -EINVAL; |