7 files changed, 38 insertions, 18 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index d21eb77444..fbc223486f 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -245,6 +245,7 @@ int device_add(struct device *dev)
 
         if ((error = kobject_add(&dev->kobj)))
                 goto Error;
+        kobject_hotplug(&dev->kobj, KOBJ_ADD);
         if ((error = device_pm_add(dev)))
                 goto PMError;
         if ((error = bus_add_device(dev)))
@@ -257,14 +258,13 @@ int device_add(struct device *dev)
         /* notify platform of device entry */
         if (platform_notify)
                 platform_notify(dev);
-
-        kobject_hotplug(&dev->kobj, KOBJ_ADD);
  Done:
         put_device(dev);
         return error;
  BusError:
         device_pm_remove(dev);
  PMError:
+        kobject_hotplug(&dev->kobj, KOBJ_REMOVE);
         kobject_del(&dev->kobj);
  Error:
         if (parent)
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index dd0d4c4631..867d443e71 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -516,6 +516,11 @@ create_iface(struct device_node *np, struct device *dev)
         u32 *psteps, *prate;
         int rc;
 
+        if (np->n_intrs < 1 || np->n_addrs < 1) {
+                printk(KERN_ERR "%s: Missing interrupt or address !\n",
+                       np->full_name);
+                return -ENODEV;
+        }
         if (pmac_low_i2c_lock(np))
                 return -ENODEV;
 
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index fe6abe3416..1db0226829 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -43,15 +43,15 @@ enum saa6752hs_videoformat {
 static const struct v4l2_format v4l2_format_table[] =
 {
         [SAA6752HS_VF_D1] = {
-                .fmt.pix.width = 720, .fmt.pix.height = 576 },
+                .fmt = { .pix = { .width = 720, .height = 576 }, }, },
         [SAA6752HS_VF_2_3_D1] = {
-                .fmt.pix.width = 480, .fmt.pix.height = 576 },
+                .fmt = { .pix = { .width = 480, .height = 576 }, }, },
         [SAA6752HS_VF_1_2_D1] = {
-                .fmt.pix.width = 352, .fmt.pix.height = 576 },
+                .fmt = { .pix = { .width = 352, .height = 576 }, }, },
         [SAA6752HS_VF_SIF] = {
-                .fmt.pix.width = 352, .fmt.pix.height = 288 },
+                .fmt = { .pix = { .width = 352, .height = 288 }, }, },
         [SAA6752HS_VF_UNKNOWN] = {
-                .fmt.pix.width = 0, .fmt.pix.height = 0},
+                .fmt = { .pix = { .width = 0, .height = 0 }, }, },
 };
 
 struct saa6752hs_state {
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index b5b4a7b119..d4eee99c2b 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -383,7 +383,10 @@ static int mmc_blk_probe(struct mmc_card *card)
         struct mmc_blk_data *md;
         int err;
 
-        if (card->csd.cmdclass & ~0x1ff)
+        /*
+         * Check that the card supports the command class(es) we need.
+         */
+        if (!(card->csd.cmdclass & CCC_BLOCK_READ))
                 return -ENODEV;
 
         if (card->csd.read_blkbits < 9) {
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 4d2bdbdd34..f10dd74988 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -61,8 +61,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.27"
-#define DRV_MODULE_RELDATE      "May 5, 2005"
+#define DRV_MODULE_VERSION      "3.29"
+#define DRV_MODULE_RELDATE      "May 23, 2005"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -206,6 +206,8 @@ static struct pci_device_id tg3_pci_tbl[] = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
         { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752M,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
         { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
         { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753M,
@@ -8994,7 +8996,7 @@ static int __devinit tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dm
         return ret;
 }
 
-#define TEST_BUFFER_SIZE        0x400
+#define TEST_BUFFER_SIZE        0x2000
 
 static int __devinit tg3_test_dma(struct tg3 *tp)
 {
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index f90efa265b..c13e563200 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -659,8 +659,11 @@ ahc_linux_slave_alloc(struct scsi_device *device)
         ahc_lock(ahc, &flags);
         targ = ahc->platform_data->targets[target_offset];
         if (targ == NULL) {
-                targ = ahc_linux_alloc_target(ahc, starget->channel, starget->id);
-                struct seeprom_config *sc = ahc->seep_config;
+                struct seeprom_config *sc;
+
+                targ = ahc_linux_alloc_target(ahc, starget->channel,
+                                                starget->id);
+                sc = ahc->seep_config;
                 if (targ == NULL)
                         goto out;
 
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 3bbf0cc6e5..30e8beb714 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -682,8 +682,6 @@ static void autoconfig_16550a(struct uart_8250_port *up)
          * from EXCR1. Switch back to bank 0, change it in MCR. Then
          * switch back to bank 2, read it from EXCR1 again and check
          * it's changed. If so, set baud_base in EXCR2 to 921600. -- dwmw2
-         * On PowerPC we don't want to change baud_base, as we have
-         * a number of different divisors.  -- Tom Rini
          */
         serial_outp(up, UART_LCR, 0);
         status1 = serial_in(up, UART_MCR);
@@ -699,16 +697,25 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                 serial_outp(up, UART_MCR, status1);
 
                 if ((status2 ^ status1) & UART_MCR_LOOP) {
-#ifndef CONFIG_PPC
+                        unsigned short quot;
+
                         serial_outp(up, UART_LCR, 0xE0);
+
+                        quot = serial_inp(up, UART_DLM) << 8;
+                        quot += serial_inp(up, UART_DLL);
+                        quot <<= 3;
+
                         status1 = serial_in(up, 0x04); /* EXCR1 */
                         status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
                         status1 |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
                         serial_outp(up, 0x04, status1);
+                        
+                        serial_outp(up, UART_DLL, quot & 0xff);
+                        serial_outp(up, UART_DLM, quot >> 8);
+
                         serial_outp(up, UART_LCR, 0);
-                        up->port.uartclk = 921600*16;
-#endif
 
+                        up->port.uartclk = 921600*16;
                         up->port.type = PORT_NS16550A;
                         up->capabilities |= UART_NATSEMI;
                         return;