summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/ce6230.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-17 07:51:02 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-17 07:51:07 +0100
commit99f4c9de2b707795acb215e2e94df7ea266042b5 (patch)
tree6123682a8e0d880feebb690a55b3fb442ef3dee8 /drivers/media/dvb/dvb-usb/ce6230.c
parent62ad33f67003b9a7b6013f0511579b9805e11626 (diff)
parent156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff)
downloadtalos-op-linux-99f4c9de2b707795acb215e2e94df7ea266042b5.tar.gz
talos-op-linux-99f4c9de2b707795acb215e2e94df7ea266042b5.zip
Merge commit 'v2.6.32-rc7' into core/iommu
Merge reason: Add fixes we'll depend on. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/ce6230.c')
-rw-r--r--drivers/media/dvb/dvb-usb/ce6230.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/ce6230.c b/drivers/media/dvb/dvb-usb/ce6230.c
index 0737c6377892..3df2045b7d2d 100644
--- a/drivers/media/dvb/dvb-usb/ce6230.c
+++ b/drivers/media/dvb/dvb-usb/ce6230.c
@@ -105,7 +105,7 @@ static int ce6230_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
int i = 0;
struct req_t req;
int ret = 0;
- memset(&req, 0, sizeof(&req));
+ memset(&req, 0, sizeof(req));
if (num > 2)
return -EINVAL;
OpenPOWER on IntegriCloud