Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[sfrench/cifs-2.6.git] / drivers / media / dvb-core / dvb_frontend.h

diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h
index fb6e84811504da1385939324227caa3301fa494f..482912d3b77aad8e3ef23117f50cf1d5c3a3a2c4 100644 (file)
--- a/drivers/media/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb-core/dvb_frontend.h
@@ -225,7 +225,7 @@ struct dvb_tuner_ops {
 
        struct dvb_tuner_info info;
 
-       int (*release)(struct dvb_frontend *fe);
+       void (*release)(struct dvb_frontend *fe);
        int (*init)(struct dvb_frontend *fe);
        int (*sleep)(struct dvb_frontend *fe);
        int (*suspend)(struct dvb_frontend *fe);
@@ -323,7 +323,11 @@ struct dtv_frontend_properties;
  *
  * @info:              embedded struct dvb_tuner_info with tuner properties
  * @delsys:            Delivery systems supported by the frontend
- * @release:           callback function called when frontend is dettached.
+ * @detach:            callback function called when frontend is detached.
+ *                     drivers should clean up, but not yet free the struct
+ *                     dvb_frontend allocation.
+ * @release:           callback function called when frontend is ready to be
+ *                     freed.
  *                     drivers should free any allocated memory.
  * @release_sec:       callback function requesting that the Satelite Equipment
  *                     Control (SEC) driver to release and free any memory
@@ -408,6 +412,7 @@ struct dvb_frontend_ops {
 
        u8 delsys[MAX_DELSYS];
 
+       void (*detach)(struct dvb_frontend *fe);
        void (*release)(struct dvb_frontend* fe);
        void (*release_sec)(struct dvb_frontend* fe);
 
@@ -655,6 +660,7 @@ struct dtv_frontend_properties {
  */
 
 struct dvb_frontend {
+       struct kref refcount;
        struct dvb_frontend_ops ops;
        struct dvb_adapter *dvb;
        void *demodulator_priv;