← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to drivers/media/dvb/dvb-usb/dib0700_core.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/dvb/dvb-usb/dib0700_core.c
158
158
                                err("i2c read error (status = %d)\n", result);
159
159
                                break;
160
160
                        }
 
161
 
 
162
                        deb_data("<<< ");
 
163
                        debug_dump(msg[i].buf, msg[i].len, deb_data);
 
164
 
161
165
                } else {
162
166
                        /* Write request */
163
167
                        buf[0] = REQUEST_NEW_I2C_WRITE;
169
173
                        /* The Actual i2c payload */
170
174
                        memcpy(&buf[4], msg[i].buf, msg[i].len);
171
175
 
 
176
                        deb_data(">>> ");
 
177
                        debug_dump(buf, msg[i].len + 4, deb_data);
 
178
 
172
179
                        result = usb_control_msg(d->udev,
173
180
                                                 usb_sndctrlpipe(d->udev, 0),
174
181
                                                 REQUEST_NEW_I2C_WRITE,
211
218
 
212
219
                        /* special thing in the current firmware: when length is zero the read-failed */
213
220
                        if ((len = dib0700_ctrl_rd(d, buf, msg[i].len + 2, msg[i+1].buf, msg[i+1].len)) <= 0) {
214
 
                                deb_info("I2C read failed on address %x\n", msg[i].addr);
 
221
                                deb_info("I2C read failed on address 0x%02x\n",
 
222
                                         msg[i].addr);
215
223
                                break;
216
224
                        }
217
225