Commit 6b41fb27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-6.6-rc1-2' of... 

Merge tag 'driver-core-6.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver symbol lookup fix from Greg KH:
 "Here is one last fixup for your tree for 6.6-rc1. It resolves a
  problem with the way that symbol_get was changed in the module tree
  merge in your tree to fix up the DVB drivers which rely on this old
  api to attach new devices.

  As the changelog comment says:

    In commit 9011e49d ("modules: only allow symbol_get of
    EXPORT_SYMBOL_GPL modules") the use of symbol_get is properly
    restricted to GPL-only marked symbols. This interacts oddly with the
    DVB logic which only uses dvb_attach() to load the dvb driver which
    then uses symbol_get().

    Fix this up by properly marking all of the dvb_attach attach symbols
    as EXPORT_SYMBOL_GPL().

  This has been acked by Hans from the V4L driver side, Luis from the
  module side, Mauro on the media side, and Christoph said it was the
  correct solution, and was tested by the original reporter of the
  issue.

  It has passed 0-day testing, but has not been in linux-next due to it
  only being sent yesterday"

* tag 'driver-core-6.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  media: dvb: symbol fixup for dvb_attach()
parents 474197a4 86495af1

drivers/media/dvb-frontends/ascot2e.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ struct dvb_frontend *ascot2e_attach(struct dvb_frontend *fe, 
		priv->i2c_address, priv->i2c);

	return fe;

}

EXPORT_SYMBOL(ascot2e_attach);

EXPORT_SYMBOL_GPL(ascot2e_attach);



MODULE_DESCRIPTION("Sony ASCOT2E terr/cab tuner driver");

MODULE_AUTHOR("info@netup.ru");

drivers/media/dvb-frontends/atbm8830.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ struct dvb_frontend *atbm8830_attach(const struct atbm8830_config *config, 
	return NULL;



}

EXPORT_SYMBOL(atbm8830_attach);

EXPORT_SYMBOL_GPL(atbm8830_attach);



MODULE_DESCRIPTION("AltoBeam ATBM8830/8831 GB20600 demodulator driver");

MODULE_AUTHOR("David T. L. Wong <davidtlwong@gmail.com>");

drivers/media/dvb-frontends/au8522_dig.c

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ struct dvb_frontend *au8522_attach(const struct au8522_config *config, 
	au8522_release_state(state);

	return NULL;

}

EXPORT_SYMBOL(au8522_attach);

EXPORT_SYMBOL_GPL(au8522_attach);



static const struct dvb_frontend_ops au8522_ops = {

	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },

drivers/media/dvb-frontends/bcm3510.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config, 
	kfree(state);

	return NULL;

}

EXPORT_SYMBOL(bcm3510_attach);

EXPORT_SYMBOL_GPL(bcm3510_attach);



static const struct dvb_frontend_ops bcm3510_ops = {

	.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },

drivers/media/dvb-frontends/cx22700.c

+1 −1
Original line number Diff line number Diff line
@@ -432,4 +432,4 @@ MODULE_DESCRIPTION("Conexant CX22700 DVB-T Demodulator driver"); 
MODULE_AUTHOR("Holger Waechtler");

MODULE_LICENSE("GPL");



EXPORT_SYMBOL(cx22700_attach);
 
EXPORT_SYMBOL_GPL(cx22700_attach);