Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (28b8383d) · Commits · 戴 / test

drivers/media/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -6,3 +6,6 @@ obj-y := common/
		obj-y += video/
		obj-$(CONFIG_VIDEO_DEV) += radio/
		obj-$(CONFIG_DVB_CORE) += dvb/
		ifeq ($(CONFIG_DVB_CORE),)
		obj-$(CONFIG_VIDEO_TUNER) += dvb/frontends/
		endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -445,7 +445,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
		s5h1409_readreg(state, 0xe3) \| 0x1100);
		else
		return s5h1409_writereg(state, 0xe3,
		s5h1409_readreg(state, 0xe3) & 0xeeff);
		s5h1409_readreg(state, 0xe3) & 0xfeff);
		}

		static int s5h1409_sleep(struct dvb_frontend* fe, int enable)

+11 −1

Original line number	Diff line number	Diff line
		@@ -97,6 +97,11 @@ int bt832_init(struct i2c_client *i2c_client_s)
		int rc;

		buf=kmalloc(65,GFP_KERNEL);
		if (!buf) {
		v4l_err(&t->client,
		"Unable to allocate memory. Detaching.\n");
		return 0;
		}
		bt832_hexdump(i2c_client_s,buf);

		if(buf[0x40] != 0x31) {
		@@ -212,6 +217,11 @@ bt832_command(struct i2c_client client, unsigned int cmd, void arg)
		case BT832_HEXDUMP: {
		unsigned char *buf;
		buf = kmalloc(65, GFP_KERNEL);
		if (!buf) {
		v4l_err(&t->client,
		"Unable to allocate memory\n");
		break;
		}
		bt832_hexdump(&t->client,buf);
		kfree(buf);
		}