diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-21 14:10:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-21 14:10:30 -0500 |
| commit | e695e10bc996d6f83df7d85f1011c8d00573f68b (patch) | |
| tree | 3d0ba107ea8fe7d0090e3cfd5e36cdb4abcaab99 /drivers/media/video/pvrusb2/pvrusb2-tuner.c | |
| parent | 3a5f10e3708e00c406f154bae412652ec3eb2b48 (diff) | |
| parent | f6982d59480953a8f5a84c237a9dabff39f788ce (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (196 commits)
V4L/DVB (5253): Qt1010: whitespace / 80 column cleanups
V4L/DVB (5252): Qt1010: use ARRAY_SIZE macro when appropriate
V4L/DVB (5251): Qt1010: fix compiler warning
V4L/DVB (5249): Fix compiler warning in vivi.c
V4L/DVB (5247): Stv0297: Enable BER/UNC counting
V4L/DVB (5246): Budget-ci: IR handling fixups
V4L/DVB (5245): Dvb-ttpci: use i2c gate ctrl from stv0297 frontend driver
V4L/DVB (5244): Dvbdev: fix illegal re-usage of fileoperations struct
V4L/DVB (5178): Avoid race when deregistering the IR control for dvb-usb
V4L/DVB (5240): Qt1010: use i2c_gate_ctrl where appropriate
V4L/DVB (5239): Whitespace / 80-column cleanups
V4L/DVB (5238): Kconfig: qt1010 should be selected by gl861 and au6610
V4L/DVB (5237): Dvb: add new qt1010 tuner module
V4L/DVB (5236): Initial support for Sigmatek DVB-110 DVB-T
V4L/DVB (5235): Gl861: use parallel_ts
V4L/DVB (5234): Gl861: remove unneeded declaration
V4L/DVB (5233): Gl861: correct address of the bulk endpoint
V4L/DVB (5232): Gl861: correct oops when loading module
V4L/DVB (5231): Gl861: whitespace cleanups
V4L/DVB (5230): Gl861: remove NULL entry from gl861_properties
...
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-tuner.c')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-tuner.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c index bb17db3f6434..05e65ce2e3a9 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-tuner.c +++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.c | |||
| @@ -93,9 +93,8 @@ int pvr2_i2c_tuner_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) | |||
| 93 | struct pvr2_tuner_handler *ctxt; | 93 | struct pvr2_tuner_handler *ctxt; |
| 94 | if (cp->handler) return 0; | 94 | if (cp->handler) return 0; |
| 95 | 95 | ||
| 96 | ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL); | 96 | ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL); |
| 97 | if (!ctxt) return 0; | 97 | if (!ctxt) return 0; |
| 98 | memset(ctxt,0,sizeof(*ctxt)); | ||
| 99 | 98 | ||
| 100 | ctxt->i2c_handler.func_data = ctxt; | 99 | ctxt->i2c_handler.func_data = ctxt; |
| 101 | ctxt->i2c_handler.func_table = &tuner_funcs; | 100 | ctxt->i2c_handler.func_table = &tuner_funcs; |