diff --git a/camera/ProCamera.cpp b/camera/ProCamera.cpp
index 92ec9d6..8fd08f4 100644
--- a/camera/ProCamera.cpp
+++ b/camera/ProCamera.cpp
@@ -278,7 +278,8 @@
     sp <IProCameraUser> c = mCamera;
     if (c == 0) return NO_INIT;
 
-    return c->createStream(width, height, format, surface, streamId);
+    return c->createStream(width, height, format, surface->getIGraphicBufferProducer(),
+                           streamId);
 }
 
 status_t ProCamera::createStream(int width, int height, int format,
@@ -293,10 +294,10 @@
     status_t stat = INVALID_OPERATION;
 
     if (bufferProducer != 0) {
-        binder = bufferProducer->asBinder();
+        sp <IProCameraUser> c = mCamera;
+        if (c == 0) return NO_INIT;
 
-        ALOGV("%s: createStreamT END (%d), StreamID = %d", __FUNCTION__, stat,
-                                                                    *streamId);
+        return c->createStream(width, height, format, bufferProducer, streamId);
     }
     else {
         *streamId = -1;