Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 37 insertions, 4 deletions

diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c
index 51919fcd50c2..bcd9ba68c9f2 100644
--- a/drivers/net/ks8851.c
+++ b/drivers/net/ks8851.c
@@ -141,7 +141,7 @@ static int msg_enable;
  *
  * All these calls issue SPI transactions to access the chip's registers. They
  * all require that the necessary lock is held to prevent accesses when the
- * chip is busy transfering packet data (RX/TX FIFO accesses).
+ * chip is busy transferring packet data (RX/TX FIFO accesses).
  */
 
 /**
@@ -483,7 +483,7 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
          *
          * This form of operation would require us to hold the SPI bus'
          * chipselect low during the entie transaction to avoid any
-         * reset to the data stream comming from the chip.
+         * reset to the data stream coming from the chip.
          */
 
         for (; rxfc != 0; rxfc--) {
@@ -634,7 +634,7 @@ static void ks8851_irq_work(struct work_struct *work)
 
 /**
  * calc_txlen - calculate size of message to send packet
- * @len: Lenght of data
+ * @len: Length of data
  *
  * Returns the size of the TXFIFO message needed to send
  * this packet.
@@ -1472,7 +1472,7 @@ static int ks8851_phy_reg(int reg)
  * @reg: The register to read.
  *
  * This call reads data from the PHY register specified in @reg. Since the
- * device does not support all the MII registers, the non-existant values
+ * device does not support all the MII registers, the non-existent values
  * are always returned as zero.
  *
  * We return zero for unsupported registers as the MII code does not check
@@ -1545,6 +1545,37 @@ static int ks8851_read_selftest(struct ks8851_net *ks)
 
 /* driver bus management functions */
 
+#ifdef CONFIG_PM
+static int ks8851_suspend(struct spi_device *spi, pm_message_t state)
+{
+        struct ks8851_net *ks = dev_get_drvdata(&spi->dev);
+        struct net_device *dev = ks->netdev;
+
+        if (netif_running(dev)) {
+                netif_device_detach(dev);
+                ks8851_net_stop(dev);
+        }
+
+        return 0;
+}
+
+static int ks8851_resume(struct spi_device *spi)
+{
+        struct ks8851_net *ks = dev_get_drvdata(&spi->dev);
+        struct net_device *dev = ks->netdev;
+
+        if (netif_running(dev)) {
+                ks8851_net_open(dev);
+                netif_device_attach(dev);
+        }
+
+        return 0;
+}
+#else
+#define ks8851_suspend NULL
+#define ks8851_resume NULL
+#endif
+
 static int __devinit ks8851_probe(struct spi_device *spi)
 {
         struct net_device *ndev;
@@ -1679,6 +1710,8 @@ static struct spi_driver ks8851_driver = {
         },
         .probe = ks8851_probe,
         .remove = __devexit_p(ks8851_remove),
+        .suspend = ks8851_suspend,
+        .resume = ks8851_resume,
 };
 
 static int __init ks8851_init(void)