Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision 5f6e25e31dad65ed596bf61da69a51ec21c54ec7)
+++ uspace/drv/char/ns8250/ns8250.c	(revision 5b68e0ca93e8b5310f537cf69218025800ed6aab)
@@ -111,4 +111,6 @@
 	/** The fibril mutex for synchronizing the access to the device. */
 	fibril_mutex_t mutex;
+	/** True if device is removed. */
+	bool removed;
 } ns8250_t;
 
@@ -219,8 +221,10 @@
 
 static int ns8250_add_device(ddf_dev_t *dev);
+static int ns8250_dev_remove(ddf_dev_t *dev);
 
 /** The serial port device driver's standard operations. */
 static driver_ops_t ns8250_ops = {
-	.add_device = &ns8250_add_device
+	.add_device = &ns8250_add_device,
+	.dev_remove = &ns8250_dev_remove
 };
 
@@ -612,4 +616,18 @@
 }
 
+/** Deinitialize the serial port device.
+ *
+ * @param ns		Serial port device
+ */
+static void ns8250_port_cleanup(ns8250_t *ns)
+{
+	/* Disable FIFO */
+	pio_write_8(ns->port + 2, 0x00);
+	/* Disable DTR, RTS, OUT1, OUT2 (int. enable) */
+	pio_write_8(ns->port + 4, 0x00);
+	/* Disable all interrupts from the port */
+	ns8250_port_interrupts_disable(ns->port);
+}
+
 /** Read the data from the serial port device and store them to the input
  * buffer.
@@ -769,4 +787,31 @@
 }
 
+static int ns8250_dev_remove(ddf_dev_t *dev)
+{
+	ns8250_t *ns = NS8250_FROM_DEV(dev);
+	int rc;
+	
+	fibril_mutex_lock(&ns->mutex);
+	if (ns->client_connected) {
+		fibril_mutex_unlock(&ns->mutex);
+		return EBUSY;
+	}
+	ns->removed = true;
+	fibril_mutex_unlock(&ns->mutex);
+	
+	rc = ddf_fun_unbind(ns->fun);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Failed to unbind function.");
+		return rc;
+	}
+	
+	ddf_fun_destroy(ns->fun);
+	
+	ns8250_port_cleanup(ns);
+	ns8250_unregister_interrupt_handler(ns);
+	ns8250_dev_cleanup(ns);
+	return EOK;
+}
+
 /** Open the device.
  *
@@ -778,15 +823,17 @@
 static int ns8250_open(ddf_fun_t *fun)
 {
-	ns8250_t *data = (ns8250_t *) fun->dev->driver_data;
+	ns8250_t *ns = NS8250(fun);
 	int res;
 	
-	fibril_mutex_lock(&data->mutex);
-	if (data->client_connected) {
+	fibril_mutex_lock(&ns->mutex);
+	if (ns->client_connected) {
 		res = ELIMIT;
+	} else if (ns->removed) {
+		res = ENXIO;
 	} else {
 		res = EOK;
-		data->client_connected = true;
-	}
-	fibril_mutex_unlock(&data->mutex);
+		ns->client_connected = true;
+	}
+	fibril_mutex_unlock(&ns->mutex);
 	
 	return res;