--- a/qtmobility/src/multimedia/qradiotuner.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotuner.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -102,7 +102,7 @@
     d->provider = provider;
 
     if (d->service != 0) {
-        d->control = qobject_cast<QRadioTunerControl*>(d->service->control(QRadioTunerControl_iid));
+        d->control = qobject_cast<QRadioTunerControl*>(d->service->requestControl(QRadioTunerControl_iid));
         if (d->control != 0) {
             connect(d->control, SIGNAL(stateChanged(QRadioTuner::State)), SIGNAL(stateChanged(QRadioTuner::State)));
             connect(d->control, SIGNAL(bandChanged(QRadioTuner::Band)), SIGNAL(bandChanged(QRadioTuner::Band)));
@@ -124,6 +124,9 @@
 {
     Q_D(QRadioTuner);
 
+    if (d->service && d->control)
+        d->service->releaseControl(d->control);
+
     d->provider->releaseService(d->service);
 }
 
@@ -141,12 +144,12 @@
 /*!
     Returns the availability error state.
 */
-QtMediaServices::AvailabilityError QRadioTuner::availabilityError() const
+QtMultimedia::AvailabilityError QRadioTuner::availabilityError() const
 {
     if (d_func()->control != NULL)
         return d_func()->control->availabilityError();
     else
-        return QtMediaServices::ServiceMissingError;
+        return QtMultimedia::ServiceMissingError;
 }
 
 /*!