diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
| commit | 4b5a5096bb834102b2e821f5f34274f041862d67 (patch) | |
| tree | fe55f4f11111e34d503a6a01aeb4bfc2eae5e88a /drivers/media/usb/gspca/pac7302.c | |
| parent | 19570d747795f0ecff79403698b868dc5ad7fa86 (diff) | |
| parent | 150116bcfbd9004f01e682535baddaca2b90d3b2 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/media/usb/gspca/pac7302.c')
| -rw-r--r-- | drivers/media/usb/gspca/pac7302.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c index a91509643563..2fd1c5e31a0f 100644 --- a/drivers/media/usb/gspca/pac7302.c +++ b/drivers/media/usb/gspca/pac7302.c @@ -874,7 +874,7 @@ static int sd_dbg_s_register(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; u8 data0, data1; |